diff --git a/.classpath b/.classpath deleted file mode 100644 index 43b542d4a..000000000 --- a/.classpath +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.github/workflows/jpackage.yml b/.github/workflows/jpackage.yml new file mode 100644 index 000000000..2eaa7796a --- /dev/null +++ b/.github/workflows/jpackage.yml @@ -0,0 +1,105 @@ +name: Package JGAAP + +on: + push: + branches: [ "gradle" ] + pull_request: + types: + - closed + +jobs: + build-windows-installer: + name: Build Installer on Windows + runs-on: windows-latest + steps: + +# SETUP BUILD ENVIRONMENT + - id: checkout-code + name: Checkout code + uses: actions/checkout@v4 + - id: setup-jdk + name: Setup JDK + uses: actions/setup-java@v4 + with: + java-package: jdk+fx + architecture: x64 + distribution: 'zulu' + java-version: '21' + +# BUILD FOR DISTRIBUTION + - id: build + name: Build distribution + run: ./gradlew jpackage + +# SAVE INSTALLER + - id: upload-installer + name: Upload installer + uses: actions/upload-artifact@v4 + with: + path: ./jgaap/build/jpackage/JGAAP-9.0.0.msi + name: windows-installer + retention-days: 1 + + build-macos-intel-installer: + name: Build Installer on macOS intel + runs-on: macos-13 + steps: + +# SETUP BUILD ENVIRONMENT + - id: checkout-code + name: Checkout code + uses: actions/checkout@v4 + - id: setup-jdk + name: Setup JDK + uses: actions/setup-java@v4 + with: + java-package: jdk+fx + architecture: x64 + distribution: 'zulu' + java-version: '21' + +# BUILD FOR DISTRIBUTION + - id: build + name: Build distribution + run: ./gradlew jpackage + +# SAVE INSTALLER + - id: upload-installer + name: Upload installer + uses: actions/upload-artifact@v4 + with: + path: ./jgaap/build/jpackage/JGAAP-x86_64-9.0.0.dmg + name: macOS-dmg-Intel + retention-days: 1 + + build-macos-AS-installer: + name: Build Installer on macOS ARM + runs-on: macos-latest + steps: + +# SETUP BUILD ENVIRONMENT + - id: checkout-code + name: Checkout code + uses: actions/checkout@v4 + - id: setup-jdk + name: Setup JDK + uses: actions/setup-java@v4 + with: + java-package: jdk+fx + architecture: aarch64 + distribution: 'zulu' + java-version: '21' + +# BUILD FOR DISTRIBUTION + - id: build + name: Build distribution + run: ./gradlew jpackage + +# SAVE INSTALLER + - id: upload-installer + name: Upload installer + uses: actions/upload-artifact@v4 + with: + path: ./jgaap/build/jpackage/JGAAP-aarch64-9.0.0.dmg + name: macOS-dmg-AS + retention-days: 1 \ No newline at end of file diff --git a/.gitignore b/.gitignore index a58a51ab7..d1993d518 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ -bin/* .DS_Store -/bin/ -src/unittest_logs -.vscode -.project -JGGAP.jar \ No newline at end of file +/build +/bin +/jgaap/build +/.gradle \ No newline at end of file diff --git a/.project b/.project index d9e160645..10955d031 100644 --- a/.project +++ b/.project @@ -5,13 +5,18 @@ - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature + + + 1720217961295 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5b0fb14ed..000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,117 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=ignore -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..e0f15db2e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/Documentation/App Information.md b/Documentation/App Information.md new file mode 100644 index 000000000..e3db7e7e6 --- /dev/null +++ b/Documentation/App Information.md @@ -0,0 +1,12 @@ +# Application information + +## Known Bugs + +- none + +--- + +## Future features + +- JGAAP log window. +- Save Results as a file. diff --git a/Documentation/Building_and_Running.md b/Documentation/Building_and_Running.md new file mode 100644 index 000000000..4cd2e47e5 --- /dev/null +++ b/Documentation/Building_and_Running.md @@ -0,0 +1,23 @@ +# Building + +## Jar file + +Export a JAR file however you wish. Include the JavaFX .Jar files in the build of the JAR and export the JAR to `JGAAP_JAVAFX/build`. + +## MacOS + +Build a .jar first. Place in `JGAAP_JAVAFX/build`. + +Use the `build_app.sh` to generate a distributable runtime. + +Check and Adjust the parameters in the script to suit your enviornment. + +## Windows + +Build a .jar first. Place in `JGAAP_JAVAFX/build`. + +Use the `build_app.bat` to generate a distributable runtime. + +Check and Adjust the parameters in the script to suit your enviornment. + +a `.msi` should appear on your desktop after successful builds. diff --git a/Documentation/Design.md b/Documentation/Design.md new file mode 100644 index 000000000..1fa5ae6cf --- /dev/null +++ b/Documentation/Design.md @@ -0,0 +1,162 @@ +# GUI Design + +## GUI Top-Level Diagram + +```mermaid +classDiagram + + GUI_CanTab -- GUI_MainWindow + GUI_DocTab -- GUI_MainWindow + GUI_ECTab -- GUI_MainWindow + GUI_EDTab -- GUI_MainWindow + GUI_MenuItemBatch -- GUI_MainWindow + GUI_AnalysisTab -- GUI_MainWindow + GUI_ReviewTab -- GUI_MainWindow + GUI_NotesWindow -- GUI_MainWindow + GUI_NotesWindow -- GUI_CanTab + GUI_NotesWindow -- GUI_DocTab + GUI_NotesWindow -- GUI_ECTab + GUI_NotesWindow -- GUI_EDTab + GUI_NotesWindow -- GUI_AnalysisTab + GUI_JGAAPAboutWindow -- GUI_MainWindow + GUI_AddAuthor -- GUI_DocTab + GUI_ResultsWindow -- GUI_ReviewTab + + class GUI_CanTab{ + -GUI_NotesWindow notesBox$ + -VBox box + +GUI_CanTab() + -build_pane() + -init_rowOne() HBox + -init_rowTwo() VBox + -init_bottomButtons() HBox + -init_ListBoxLeft() ListView~String~ + -init_ListBoxRight() ListView~String~ + -init_rowTwoButtons() VBox + -init_rowTwoSelectionDropDown() ComboBox~String~ + +getPane() VBox + } + class GUI_DocTab{ + -GUI_NotesWindow notesBox$ + -VBox box + +GUI_DocTab() + -build_tab() + -init_LangSelection() VBox + -init_UnknownAuth() VBox + -init_KnownAuth() VBox + -init_UnknownAuthButtons() HBox + -init_KnownAuthButtons() HBox + -init_bottomButtons() hBox + -init_authorTable() TableView~Object~ + -init_TreeView() TableView~Object~ + -init_langSelectBox() ComboBox~String~ + +getPane() VBox + } + class GUI_ECTab{ + -GUI_NotesWindow notesBox$ + -VBox box + +GUI_ECTab() + -build_pane() + -init_rowOne() HBox + -init_rowTwo() VBox + -init_bottomButtons() HBox + -init_ListBoxLeft() ListView~String~ + -init_ListBoxRight() ListView~String~ + -init_rowTwoButtons() VBox + -init_rowTwoSelectionDropDown() ComboBox~String~ + +getPane() VBox + } + class GUI_EDTab{ + -GUI_NotesWindow notesBox$ + -VBox box + +GUI_EDTab() + -build_pane() HBox + -init_rowOne() HBox + -init_rowTwo() VBox + -init_bottomButtons() HBox + -init_ListBoxLeft() ListView~String~ + -init_ListBoxRight() ListView~String~ + -init_rowTwoButtons() VBox + -init_rowTwoSelectionDropDown() ComboBox~String~ + +getPane() VBox + } + class GUI_MainWindow{ + -BorderPane pane$ + +start(Stage mainstage) + +main(String[] args)$ + -init_mainScene() Scene + -init_menuBar() MenuBar + } + class GUI_MenuItemBatch{ + -List~MenuItem~ items + -List~MenuItem~ problems + +GUI_MenuItemBatch() + -genItems() + -genProblems() + +getItems() List~MenuItem~ + +getproblems() List~MenuItem~ + } + class GUI_AnalysisTab{ + -VBox box; + -GUI_NotesWindow notesBox$ + +GUI_AnalysisTab() + -build_pane() + -init_rowOne() HBox + -init_rowTwo() HBox + -init_bottomButtons() HBox + -init_SelectedBox() ListView~String~ + -init_AnalysisMethodBox() ListView~String~ + -init_DistanceFunctionBox() ListView~String~ + -init_rowOneButtons() VBox + +getPane() VBox + } + class GUI_ReviewTab{ + -GUI_NotesWindow notesBox$ + -VBox box + +GUI_ReviewTab() + -build_pane() + -init_SecondRow() HBox + -init_canonicizersTable() VBox + -init_bottomButtons() HBox + -init_eventDriverTable() TableView~Object~ + -init_eventCullingTable() TableView~Object~ + -init_analysisTable() TableView~Object~ + +getPane() VBox + } + class GUI_NotesWindow{ + -Stage stage$ + -Button notes$ + -TextArea area$ + -String text$ + +GUI_NotesWindow() + -build_stage() + -init_bottomButtons() HBox + +getButton() Button + +getNotes () String + +show() + +hide() + +close() + } + class GUI_JGAAPAboutWindow{ + -Stage stage$ + +GUI_JGAAPAboutWindow() + -build_stage() + +show() + } + class GUI_AddAuthor{ + + } + class GUI_ResultsWindow{ + + } +``` + +## Dependencies + +[JavaFX version 21](https://openjfx.io/) + +[Java version 21](https://www.oracle.com/java/technologies/downloads/#java21) + +## Launching + +For the time being please launch via commandline or a debugger. If using a commandline please use the following: `java --module-path=/lib --add-modules=javafx.controls,javafx.fxml,javafx.graphics,javafx.base,javafx.swing -jar .jar` diff --git a/docs/Experiment_Engine.pdf b/Documentation/Experiment_Engine.pdf similarity index 100% rename from docs/Experiment_Engine.pdf rename to Documentation/Experiment_Engine.pdf diff --git a/Documentation/GUI_Design_Diagram.jpg b/Documentation/GUI_Design_Diagram.jpg new file mode 100644 index 000000000..6a6e640f9 Binary files /dev/null and b/Documentation/GUI_Design_Diagram.jpg differ diff --git a/docs/JGAAP_User_Guide.pdf b/Documentation/JGAAP_User_Guide.pdf similarity index 100% rename from docs/JGAAP_User_Guide.pdf rename to Documentation/JGAAP_User_Guide.pdf diff --git a/Documentation/JavaDoc/GUI/GUI_AnalysisTab.html b/Documentation/JavaDoc/GUI/GUI_AnalysisTab.html new file mode 100644 index 000000000..b58d9593a --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_AnalysisTab.html @@ -0,0 +1,183 @@ + + + + +GUI_AnalysisTab + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_AnalysisTab

+
+
java.lang.Object +
GUI.GUI_AnalysisTab
+
+
+
+
public class GUI_AnalysisTab +extends Object
+
Analysis Tab Class. + This Class creates the scene for the Analysis Tab and it's GUI elements.
+
+
+ +
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_AnalysisTab

      +
      public GUI_AnalysisTab()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getPane

      +
      public javafx.scene.layout.VBox getPane()
      +
      Getter method for getting the built pane.
      +
      +
      Returns:
      +
      VBox
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_CanTab.html b/Documentation/JavaDoc/GUI/GUI_CanTab.html new file mode 100644 index 000000000..194f7cd09 --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_CanTab.html @@ -0,0 +1,183 @@ + + + + +GUI_CanTab + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_CanTab

+
+
java.lang.Object +
GUI.GUI_CanTab
+
+
+
+
public class GUI_CanTab +extends Object
+
Canonicizer Tab Class. + This Class creates the scene for the Canonicizer Tab and it's GUI elements.
+
+
+ +
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_CanTab

      +
      public GUI_CanTab()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getPane

      +
      public javafx.scene.layout.VBox getPane()
      +
      Returns the built Pane.
      +
      +
      Returns:
      +
      VBox
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_DocTab.html b/Documentation/JavaDoc/GUI/GUI_DocTab.html new file mode 100644 index 000000000..c77665c36 --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_DocTab.html @@ -0,0 +1,183 @@ + + + + +GUI_DocTab + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_DocTab

+
+
java.lang.Object +
GUI.GUI_DocTab
+
+
+
+
public class GUI_DocTab +extends Object
+
Document Tab Class. + This Class creates the scene for the Document Tab and it's GUI elements.
+
+
+
    + +
  • +
    +

    Constructor Summary

    +
    Constructors
    +
    +
    Constructor
    +
    Description
    + +
    +
    Constructor for the class.
    +
    +
    +
    +
  • + +
  • +
    +

    Method Summary

    +
    +
    +
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    javafx.scene.layout.VBox
    + +
    +
    Getter for getting the built Pane.
    +
    +
    +
    +
    +
    +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    +
    +
  • +
+
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_DocTab

      +
      public GUI_DocTab()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getPane

      +
      public javafx.scene.layout.VBox getPane()
      +
      Getter for getting the built Pane.
      +
      +
      Returns:
      +
      VBox
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_ECTab.html b/Documentation/JavaDoc/GUI/GUI_ECTab.html new file mode 100644 index 000000000..38d70d083 --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_ECTab.html @@ -0,0 +1,183 @@ + + + + +GUI_ECTab + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_ECTab

+
+
java.lang.Object +
GUI.GUI_ECTab
+
+
+
+
public class GUI_ECTab +extends Object
+
Event Culling Tab Class. + This Class creates the scene for the Event CUlling Tab and it's GUI elements.
+
+
+
    + +
  • +
    +

    Constructor Summary

    +
    Constructors
    +
    +
    Constructor
    +
    Description
    + +
    +
    Constructor for the class.
    +
    +
    +
    +
  • + +
  • +
    +

    Method Summary

    +
    +
    +
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    javafx.scene.layout.VBox
    + +
    +
    Getter for getting the built Pane.
    +
    +
    +
    +
    +
    +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    +
    +
  • +
+
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_ECTab

      +
      public GUI_ECTab()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getPane

      +
      public javafx.scene.layout.VBox getPane()
      +
      Getter for getting the built Pane.
      +
      +
      Returns:
      +
      VBox
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_EDTab.html b/Documentation/JavaDoc/GUI/GUI_EDTab.html new file mode 100644 index 000000000..a572eaef4 --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_EDTab.html @@ -0,0 +1,183 @@ + + + + +GUI_EDTab + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_EDTab

+
+
java.lang.Object +
GUI.GUI_EDTab
+
+
+
+
public class GUI_EDTab +extends Object
+
Event Driver Tab Class. + This Class creates the scene for the Event Driver Tab and it's GUI elements.
+
+
+
    + +
  • +
    +

    Constructor Summary

    +
    Constructors
    +
    +
    Constructor
    +
    Description
    + +
    +
    Constructor for the class.
    +
    +
    +
    +
  • + +
  • +
    +

    Method Summary

    +
    +
    +
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    javafx.scene.layout.VBox
    + +
    +
    Getter for getting the built Pane.
    +
    +
    +
    +
    +
    +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    +
    +
  • +
+
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_EDTab

      +
      public GUI_EDTab()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getPane

      +
      public javafx.scene.layout.VBox getPane()
      +
      Getter for getting the built Pane.
      +
      +
      Returns:
      +
      VBox
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_JGAAPAboutWindow.html b/Documentation/JavaDoc/GUI/GUI_JGAAPAboutWindow.html new file mode 100644 index 000000000..9f8ccbbcc --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_JGAAPAboutWindow.html @@ -0,0 +1,179 @@ + + + + +GUI_JGAAPAboutWindow + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_JGAAPAboutWindow

+
+
java.lang.Object +
GUI.GUI_JGAAPAboutWindow
+
+
+
+
public class GUI_JGAAPAboutWindow +extends Object
+
About Window Class. + This Class creates the Stage for the About Window and it's GUI elements.
+
+
+ +
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_JGAAPAboutWindow

      +
      public GUI_JGAAPAboutWindow()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      show

      +
      public void show()
      +
      Controls showing or closing (Hiding) the window.
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_MainWindow.html b/Documentation/JavaDoc/GUI/GUI_MainWindow.html new file mode 100644 index 000000000..756c39f7f --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_MainWindow.html @@ -0,0 +1,219 @@ + + + + +GUI_MainWindow + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_MainWindow

+
+
java.lang.Object +
javafx.application.Application +
GUI.GUI_MainWindow
+
+
+
+
+
public class GUI_MainWindow +extends javafx.application.Application
+
Main Window Class. + This Class is the heart of the GUI, and controls the GUI as a whole. It is used to intertwine all the other classes.
+
+
+
    + +
  • +
    +

    Nested Class Summary

    +
    +

    Nested classes/interfaces inherited from class javafx.application.Application

    +javafx.application.Application.Parameters
    +
    +
  • + +
  • +
    +

    Field Summary

    +
    +

    Fields inherited from class javafx.application.Application

    +STYLESHEET_CASPIAN, STYLESHEET_MODENA
    +
    +
  • + +
  • +
    +

    Constructor Summary

    +
    Constructors
    +
    +
    Constructor
    +
    Description
    + +
     
    +
    +
    +
  • + +
  • +
    +

    Method Summary

    +
    +
    +
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    static void
    +
    main(String[] args)
    +
    +
    Used for debugging.
    +
    +
    void
    +
    start(javafx.stage.Stage mainStage)
    +
    +
    Main Method for setting up the GUI for JavaFX.
    +
    +
    +
    +
    +
    +

    Methods inherited from class javafx.application.Application

    +getHostServices, getParameters, getUserAgentStylesheet, init, launch, launch, notifyPreloader, setUserAgentStylesheet, stop
    +
    +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    +
    +
  • +
+
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_MainWindow

      +
      public GUI_MainWindow()
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      main

      +
      public static void main(String[] args)
      +
      Used for debugging.
      +
      +
      Parameters:
      +
      args - Normal Java Main Args
      +
      +
      +
    • +
    • +
      +

      start

      +
      public void start(javafx.stage.Stage mainStage)
      +
      Main Method for setting up the GUI for JavaFX.
      +
      +
      Specified by:
      +
      start in class javafx.application.Application
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_MenuItemsBatch.html b/Documentation/JavaDoc/GUI/GUI_MenuItemsBatch.html new file mode 100644 index 000000000..f1f24e4de --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_MenuItemsBatch.html @@ -0,0 +1,199 @@ + + + + +GUI_MenuItemsBatch + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_MenuItemsBatch

+
+
java.lang.Object +
GUI.GUI_MenuItemsBatch
+
+
+
+
public class GUI_MenuItemsBatch +extends Object
+
Menu Item Batch Class File. + This class is used to generate the menu items under File/Help that appear in the menu bar.
+
+
+ +
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_MenuItemsBatch

      +
      public GUI_MenuItemsBatch()
      +
      Constructor of the Class
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getItems

      +
      public List<javafx.scene.control.MenuItem> getItems()
      +
      Getter Function for the "File" Menu Items
      +
      +
      Returns:
      +
      List
      +
      +
      +
    • +
    • +
      +

      getProblems

      +
      public List<javafx.scene.control.MenuItem> getProblems()
      +
      Getter Function for the "AAAC Problem" Menu Items
      +
      +
      Returns:
      +
      List
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_NotesWindow.html b/Documentation/JavaDoc/GUI/GUI_NotesWindow.html new file mode 100644 index 000000000..d32dc64a1 --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_NotesWindow.html @@ -0,0 +1,235 @@ + + + + +GUI_NotesWindow + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_NotesWindow

+
+
java.lang.Object +
GUI.GUI_NotesWindow
+
+
+
+
public class GUI_NotesWindow +extends Object
+
Notes Window Class. + This Class creates the Stage for the Notes Window and it's GUI elements.
+
+
+
    + +
  • +
    +

    Constructor Summary

    +
    Constructors
    +
    +
    Constructor
    +
    Description
    + +
    +
    Constructor for the class.
    +
    +
    +
    +
  • + +
  • +
    +

    Method Summary

    +
    +
    +
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    void
    + +
    +
    Close (hide) the Window.
    +
    +
    javafx.scene.control.Button
    + +
    +
    Getter for getting the "Notes" button for the GUI windows.
    +
    + + +
    +
    Getter for getting the notes typed in the Text Area.
    +
    +
    void
    + +
    +
    Hide the Window.
    +
    +
    void
    + +
    +
    Show the Window.
    +
    +
    +
    +
    +
    +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    +
    +
  • +
+
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_NotesWindow

      +
      public GUI_NotesWindow()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      show

      +
      public void show()
      +
      Show the Window.
      +
      +
    • +
    • +
      +

      hide

      +
      public void hide()
      +
      Hide the Window.
      +
      +
    • +
    • +
      +

      close

      +
      public void close()
      +
      Close (hide) the Window.
      +
      +
    • +
    • +
      +

      getNotes

      +
      public String getNotes()
      +
      Getter for getting the notes typed in the Text Area.
      +
      +
      Returns:
      +
      String
      +
      +
      +
    • +
    • +
      +

      getButton

      +
      public javafx.scene.control.Button getButton()
      +
      Getter for getting the "Notes" button for the GUI windows.
      +
      +
      Returns:
      +
      Button
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/GUI_ReviewTab.html b/Documentation/JavaDoc/GUI/GUI_ReviewTab.html new file mode 100644 index 000000000..4ffe5dbf8 --- /dev/null +++ b/Documentation/JavaDoc/GUI/GUI_ReviewTab.html @@ -0,0 +1,183 @@ + + + + +GUI_ReviewTab + + + + + + + + + + + + + + +
+ +
+
+ +
+
Package GUI
+

Class GUI_ReviewTab

+
+
java.lang.Object +
GUI.GUI_ReviewTab
+
+
+
+
public class GUI_ReviewTab +extends Object
+
Review Tab Class. + This Class creates the scene for the Review Tab and it's GUI elements.
+
+
+ +
+
+
    + +
  • +
    +

    Constructor Details

    +
      +
    • +
      +

      GUI_ReviewTab

      +
      public GUI_ReviewTab()
      +
      Constructor for the class.
      +
      +
    • +
    +
    +
  • + +
  • +
    +

    Method Details

    +
      +
    • +
      +

      getPane

      +
      public javafx.scene.layout.VBox getPane()
      +
      Getter for getting the built Pane.
      +
      +
      Returns:
      +
      VBox
      +
      +
      +
    • +
    +
    +
  • +
+
+ +
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/package-summary.html b/Documentation/JavaDoc/GUI/package-summary.html new file mode 100644 index 000000000..084e104ed --- /dev/null +++ b/Documentation/JavaDoc/GUI/package-summary.html @@ -0,0 +1,128 @@ + + + + +GUI + + + + + + + + + + + + + + +
+ +
+
+
+

Package GUI

+
+
+
package GUI
+
+ +
+
+
+
+ + diff --git a/Documentation/JavaDoc/GUI/package-tree.html b/Documentation/JavaDoc/GUI/package-tree.html new file mode 100644 index 000000000..871b4184c --- /dev/null +++ b/Documentation/JavaDoc/GUI/package-tree.html @@ -0,0 +1,79 @@ + + + + +GUI Class Hierarchy + + + + + + + + + + + + + + +
+ +
+
+
+

Hierarchy For Package GUI

+
+
+

Class Hierarchy

+ +
+
+
+
+ + diff --git a/Documentation/JavaDoc/allclasses-index.html b/Documentation/JavaDoc/allclasses-index.html new file mode 100644 index 000000000..c0f3bfeb2 --- /dev/null +++ b/Documentation/JavaDoc/allclasses-index.html @@ -0,0 +1,103 @@ + + + + +All Classes and Interfaces + + + + + + + + + + + + + + +
+ +
+
+
+

All Classes and Interfaces

+
+
+
Classes
+
+
Class
+
Description
+ +
+
Analysis Tab Class.
+
+ +
+
Canonicizer Tab Class.
+
+ +
+
Document Tab Class.
+
+ +
+
Event Culling Tab Class.
+
+ +
+
Event Driver Tab Class.
+
+ +
+
About Window Class.
+
+ +
+
Main Window Class.
+
+ +
+
Menu Item Batch Class File.
+
+ +
+
Notes Window Class.
+
+ +
+
Review Tab Class.
+
+
+
+
+
+
+ + diff --git a/Documentation/JavaDoc/allpackages-index.html b/Documentation/JavaDoc/allpackages-index.html new file mode 100644 index 000000000..0eb5d43ff --- /dev/null +++ b/Documentation/JavaDoc/allpackages-index.html @@ -0,0 +1,63 @@ + + + + +All Packages + + + + + + + + + + + + + + +
+ +
+
+
+

All Packages

+
+
Package Summary
+
+
Package
+
Description
+ +
 
+
+
+
+
+ + diff --git a/Documentation/JavaDoc/copy.svg b/Documentation/JavaDoc/copy.svg new file mode 100644 index 000000000..d435f6c37 --- /dev/null +++ b/Documentation/JavaDoc/copy.svg @@ -0,0 +1,33 @@ + + + + + + + + diff --git a/Documentation/JavaDoc/element-list b/Documentation/JavaDoc/element-list new file mode 100644 index 000000000..37ec4c0b3 --- /dev/null +++ b/Documentation/JavaDoc/element-list @@ -0,0 +1 @@ +GUI diff --git a/Documentation/JavaDoc/help-doc.html b/Documentation/JavaDoc/help-doc.html new file mode 100644 index 000000000..d6fee8d6f --- /dev/null +++ b/Documentation/JavaDoc/help-doc.html @@ -0,0 +1,177 @@ + + + + +API Help + + + + + + + + + + + + + + +
+ +
+
+

JavaDoc Help

+ +
+
+

Navigation

+Starting from the Overview page, you can browse the documentation using the links in each page, and in the navigation bar at the top of each page. The Index and Search box allow you to navigate to specific declarations and summary pages, including: All Packages, All Classes and Interfaces + +
+
+
+

Kinds of Pages

+The following sections describe the different kinds of pages in this collection. +
+

Package

+

Each package has a page that contains a list of its classes and interfaces, with a summary for each. These pages may contain the following categories:

+
    +
  • Interfaces
  • +
  • Classes
  • +
  • Enum Classes
  • +
  • Exception Classes
  • +
  • Annotation Interfaces
  • +
+
+
+

Class or Interface

+

Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a declaration and description, member summary tables, and detailed member descriptions. Entries in each of these sections are omitted if they are empty or not applicable.

+
    +
  • Class Inheritance Diagram
  • +
  • Direct Subclasses
  • +
  • All Known Subinterfaces
  • +
  • All Known Implementing Classes
  • +
  • Class or Interface Declaration
  • +
  • Class or Interface Description
  • +
+
+
    +
  • Nested Class Summary
  • +
  • Enum Constant Summary
  • +
  • Field Summary
  • +
  • Property Summary
  • +
  • Constructor Summary
  • +
  • Method Summary
  • +
  • Required Element Summary
  • +
  • Optional Element Summary
  • +
+
+
    +
  • Enum Constant Details
  • +
  • Field Details
  • +
  • Property Details
  • +
  • Constructor Details
  • +
  • Method Details
  • +
  • Element Details
  • +
+

Note: Annotation interfaces have required and optional elements, but not methods. Only enum classes have enum constants. The components of a record class are displayed as part of the declaration of the record class. Properties are a feature of JavaFX.

+

The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.

+
+
+

Other Files

+

Packages and modules may contain pages with additional information related to the declarations nearby.

+
+
+

Tree (Class Hierarchy)

+

There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. Classes are organized by inheritance structure starting with java.lang.Object. Interfaces do not inherit from java.lang.Object.

+
    +
  • When viewing the Overview page, clicking on TREE displays the hierarchy for all packages.
  • +
  • When viewing a particular package, class or interface page, clicking on TREE displays the hierarchy for only that package.
  • +
+
+
+

All Packages

+

The All Packages page contains an alphabetic index of all packages contained in the documentation.

+
+
+

All Classes and Interfaces

+

The All Classes and Interfaces page contains an alphabetic index of all classes and interfaces contained in the documentation, including annotation interfaces, enum classes, and record classes.

+
+
+

Index

+

The Index contains an alphabetic index of all classes, interfaces, constructors, methods, and fields in the documentation, as well as summary pages such as All Packages, All Classes and Interfaces.

+
+
+
+This help file applies to API documentation generated by the standard doclet.
+
+
+ + diff --git a/Documentation/JavaDoc/index-all.html b/Documentation/JavaDoc/index-all.html new file mode 100644 index 000000000..09a99a6b8 --- /dev/null +++ b/Documentation/JavaDoc/index-all.html @@ -0,0 +1,216 @@ + + + + +Index + + + + + + + + + + + + + + +
+ +
+
+
+

Index

+
+C G H M S 
All Classes and Interfaces|All Packages +

C

+
+
close() - Method in class GUI.GUI_NotesWindow
+
+
Close (hide) the Window.
+
+
+

G

+
+
getButton() - Method in class GUI.GUI_NotesWindow
+
+
Getter for getting the "Notes" button for the GUI windows.
+
+
getItems() - Method in class GUI.GUI_MenuItemsBatch
+
+
Getter Function for the "File" Menu Items
+
+
getNotes() - Method in class GUI.GUI_NotesWindow
+
+
Getter for getting the notes typed in the Text Area.
+
+
getPane() - Method in class GUI.GUI_AnalysisTab
+
+
Getter method for getting the built pane.
+
+
getPane() - Method in class GUI.GUI_CanTab
+
+
Returns the built Pane.
+
+
getPane() - Method in class GUI.GUI_DocTab
+
+
Getter for getting the built Pane.
+
+
getPane() - Method in class GUI.GUI_ECTab
+
+
Getter for getting the built Pane.
+
+
getPane() - Method in class GUI.GUI_EDTab
+
+
Getter for getting the built Pane.
+
+
getPane() - Method in class GUI.GUI_ReviewTab
+
+
Getter for getting the built Pane.
+
+
getProblems() - Method in class GUI.GUI_MenuItemsBatch
+
+
Getter Function for the "AAAC Problem" Menu Items
+
+
GUI - package GUI
+
 
+
GUI_AnalysisTab - Class in GUI
+
+
Analysis Tab Class.
+
+
GUI_AnalysisTab() - Constructor for class GUI.GUI_AnalysisTab
+
+
Constructor for the class.
+
+
GUI_CanTab - Class in GUI
+
+
Canonicizer Tab Class.
+
+
GUI_CanTab() - Constructor for class GUI.GUI_CanTab
+
+
Constructor for the class.
+
+
GUI_DocTab - Class in GUI
+
+
Document Tab Class.
+
+
GUI_DocTab() - Constructor for class GUI.GUI_DocTab
+
+
Constructor for the class.
+
+
GUI_ECTab - Class in GUI
+
+
Event Culling Tab Class.
+
+
GUI_ECTab() - Constructor for class GUI.GUI_ECTab
+
+
Constructor for the class.
+
+
GUI_EDTab - Class in GUI
+
+
Event Driver Tab Class.
+
+
GUI_EDTab() - Constructor for class GUI.GUI_EDTab
+
+
Constructor for the class.
+
+
GUI_JGAAPAboutWindow - Class in GUI
+
+
About Window Class.
+
+
GUI_JGAAPAboutWindow() - Constructor for class GUI.GUI_JGAAPAboutWindow
+
+
Constructor for the class.
+
+
GUI_MainWindow - Class in GUI
+
+
Main Window Class.
+
+
GUI_MainWindow() - Constructor for class GUI.GUI_MainWindow
+
 
+
GUI_MenuItemsBatch - Class in GUI
+
+
Menu Item Batch Class File.
+
+
GUI_MenuItemsBatch() - Constructor for class GUI.GUI_MenuItemsBatch
+
+
Constructor of the Class
+
+
GUI_NotesWindow - Class in GUI
+
+
Notes Window Class.
+
+
GUI_NotesWindow() - Constructor for class GUI.GUI_NotesWindow
+
+
Constructor for the class.
+
+
GUI_ReviewTab - Class in GUI
+
+
Review Tab Class.
+
+
GUI_ReviewTab() - Constructor for class GUI.GUI_ReviewTab
+
+
Constructor for the class.
+
+
+

H

+
+
hide() - Method in class GUI.GUI_NotesWindow
+
+
Hide the Window.
+
+
+

M

+
+
main(String[]) - Static method in class GUI.GUI_MainWindow
+
+
Used for debugging.
+
+
+

S

+
+
show() - Method in class GUI.GUI_JGAAPAboutWindow
+
+
Controls showing or closing (Hiding) the window.
+
+
show() - Method in class GUI.GUI_NotesWindow
+
+
Show the Window.
+
+
start(Stage) - Method in class GUI.GUI_MainWindow
+
+
Main Method for setting up the GUI for JavaFX.
+
+
+C G H M S 
All Classes and Interfaces|All Packages
+
+
+ + diff --git a/Documentation/JavaDoc/index.html b/Documentation/JavaDoc/index.html new file mode 100644 index 000000000..7358155d2 --- /dev/null +++ b/Documentation/JavaDoc/index.html @@ -0,0 +1,26 @@ + + + + +Generated Documentation (Untitled) + + + + + + + + + + + +
+ +

GUI/package-summary.html

+
+ + diff --git a/Documentation/JavaDoc/legal/COPYRIGHT b/Documentation/JavaDoc/legal/COPYRIGHT new file mode 100644 index 000000000..945e19c13 --- /dev/null +++ b/Documentation/JavaDoc/legal/COPYRIGHT @@ -0,0 +1,69 @@ +Copyright © 1993, 2018, Oracle and/or its affiliates. +All rights reserved. + +This software and related documentation are provided under a +license agreement containing restrictions on use and +disclosure and are protected by intellectual property laws. +Except as expressly permitted in your license agreement or +allowed by law, you may not use, copy, reproduce, translate, +broadcast, modify, license, transmit, distribute, exhibit, +perform, publish, or display any part, in any form, or by +any means. Reverse engineering, disassembly, or +decompilation of this software, unless required by law for +interoperability, is prohibited. + +The information contained herein is subject to change +without notice and is not warranted to be error-free. If you +find any errors, please report them to us in writing. + +If this is software or related documentation that is +delivered to the U.S. Government or anyone licensing it on +behalf of the U.S. Government, the following notice is +applicable: + +U.S. GOVERNMENT END USERS: Oracle programs, including any +operating system, integrated software, any programs +installed on the hardware, and/or documentation, delivered +to U.S. Government end users are "commercial computer +software" pursuant to the applicable Federal Acquisition +Regulation and agency-specific supplemental regulations. As +such, use, duplication, disclosure, modification, and +adaptation of the programs, including any operating system, +integrated software, any programs installed on the hardware, +and/or documentation, shall be subject to license terms and +license restrictions applicable to the programs. No other +rights are granted to the U.S. Government. + +This software or hardware is developed for general use in a +variety of information management applications. It is not +developed or intended for use in any inherently dangerous +applications, including applications that may create a risk +of personal injury. If you use this software or hardware in +dangerous applications, then you shall be responsible to +take all appropriate fail-safe, backup, redundancy, and +other measures to ensure its safe use. Oracle Corporation +and its affiliates disclaim any liability for any damages +caused by use of this software or hardware in dangerous +applications. + +Oracle and Java are registered trademarks of Oracle and/or +its affiliates. Other names may be trademarks of their +respective owners. + +Intel and Intel Xeon are trademarks or registered trademarks +of Intel Corporation. All SPARC trademarks are used under +license and are trademarks or registered trademarks of SPARC +International, Inc. AMD, Opteron, the AMD logo, and the AMD +Opteron logo are trademarks or registered trademarks of +Advanced Micro Devices. UNIX is a registered trademark of +The Open Group. + +This software or hardware and documentation may provide +access to or information on content, products, and services +from third parties. Oracle Corporation and its affiliates +are not responsible for and expressly disclaim all +warranties of any kind with respect to third-party content, +products, and services. Oracle Corporation and its +affiliates will not be responsible for any loss, costs, or +damages incurred due to your access to or use of third-party +content, products, or services. diff --git a/Documentation/JavaDoc/legal/LICENSE b/Documentation/JavaDoc/legal/LICENSE new file mode 100644 index 000000000..ee860d38b --- /dev/null +++ b/Documentation/JavaDoc/legal/LICENSE @@ -0,0 +1,118 @@ +Your use of this Program is governed by the No-Fee Terms and Conditions set +forth below, unless you have received this Program (alone or as part of another +Oracle product) under an Oracle license agreement (including but not limited to +the Oracle Master Agreement), in which case your use of this Program is governed +solely by such license agreement with Oracle. + +Oracle No-Fee Terms and Conditions (NFTC) + +Definitions + +"Oracle" refers to Oracle America, Inc. "You" and "Your" refers to (a) a company +or organization (each an "Entity") accessing the Programs, if use of the +Programs will be on behalf of such Entity; or (b) an individual accessing the +Programs, if use of the Programs will not be on behalf of an Entity. +"Program(s)" refers to Oracle software provided by Oracle pursuant to the +following terms and any updates, error corrections, and/or Program Documentation +provided by Oracle. "Program Documentation" refers to Program user manuals and +Program installation manuals, if any. If available, Program Documentation may be +delivered with the Programs and/or may be accessed from +www.oracle.com/documentation. "Separate Terms" refers to separate license terms +that are specified in the Program Documentation, readmes or notice files and +that apply to Separately Licensed Technology. "Separately Licensed Technology" +refers to Oracle or third party technology that is licensed under Separate Terms +and not under the terms of this license. + +Separately Licensed Technology + +Oracle may provide certain notices to You in Program Documentation, readmes or +notice files in connection with Oracle or third party technology provided as or +with the Programs. If specified in the Program Documentation, readmes or notice +files, such technology will be licensed to You under Separate Terms. Your rights +to use Separately Licensed Technology under Separate Terms are not restricted in +any way by the terms herein. For clarity, notwithstanding the existence of a +notice, third party technology that is not Separately Licensed Technology shall +be deemed part of the Programs licensed to You under the terms of this license. + +Source Code for Open Source Software + +For software that You receive from Oracle in binary form that is licensed under +an open source license that gives You the right to receive the source code for +that binary, You can obtain a copy of the applicable source code from +https://oss.oracle.com/sources/ or http://www.oracle.com/goto/opensourcecode. If +the source code for such software was not provided to You with the binary, You +can also receive a copy of the source code on physical media by submitting a +written request pursuant to the instructions in the "Written Offer for Source +Code" section of the latter website. + +------------------------------------------------------------------------------- + +The following license terms apply to those Programs that are not provided to You +under Separate Terms. + +License Rights and Restrictions + +Oracle grants to You, as a recipient of this Program, subject to the conditions +stated herein, a nonexclusive, nontransferable, limited license to: + +(a) internally use the unmodified Programs for the purposes of developing, +testing, prototyping and demonstrating your applications, and running the +Program for Your own personal use or internal business operations; and + +(b) redistribute the unmodified Program and Program Documentation, under the +terms of this License, provided that You do not charge Your licensees any fees +associated with such distribution or use of the Program, including, without +limitation, fees for products that include or are bundled with a copy of the +Program or for services that involve the use of the distributed Program. + +You may make copies of the Programs to the extent reasonably necessary for +exercising the license rights granted herein and for backup purposes. You are +granted the right to use the Programs to provide third party training in the use +of the Programs and associated Separately Licensed Technology only if there is +express authorization of such use by Oracle on the Program's download page or in +the Program Documentation. + +Your license is contingent on compliance with the following conditions: + +- You do not remove markings or notices of either Oracle's or a licensor's + proprietary rights from the Programs or Program Documentation; + +- You comply with all U.S. and applicable export control and economic sanctions + laws and regulations that govern Your use of the Programs (including technical + data); + +- You do not cause or permit reverse engineering, disassembly or decompilation + of the Programs (except as allowed by law) by You nor allow an associated + party to do so. + +For clarity, any source code that may be included in the distribution with the +Programs is provided solely for reference purposes and may not be modified, +unless such source code is under Separate Terms permitting modification. + +Ownership + +Oracle or its licensors retain all ownership and intellectual property rights to +the Programs. + +Information Collection + +The Programs' installation and/or auto-update processes, if any, may transmit a +limited amount of data to Oracle or its service provider about those processes +to help Oracle understand and optimize them. Oracle does not associate the data +with personally identifiable information. Refer to Oracle's Privacy Policy at +www.oracle.com/privacy. + +Disclaimer of Warranties; Limitation of Liability + +THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE FURTHER +DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR +NONINFRINGEMENT. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL ORACLE BE LIABLE TO YOU FOR +DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. diff --git a/Documentation/JavaDoc/legal/jquery.md b/Documentation/JavaDoc/legal/jquery.md new file mode 100644 index 000000000..d468b3183 --- /dev/null +++ b/Documentation/JavaDoc/legal/jquery.md @@ -0,0 +1,72 @@ +## jQuery v3.6.1 + +### jQuery License +``` +jQuery v 3.6.1 +Copyright OpenJS Foundation and other contributors, https://openjsf.org/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +****************************************** + +The jQuery JavaScript Library v3.6.1 also includes Sizzle.js + +Sizzle.js includes the following license: + +Copyright JS Foundation and other contributors, https://js.foundation/ + +This software consists of voluntary contributions made by many +individuals. For exact contribution history, see the revision history +available at https://github.com/jquery/sizzle + +The following license applies to all parts of this software except as +documented below: + +==== + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +==== + +All files located in the node_modules and external directories are +externally maintained libraries used by this software which have their +own licenses; we recommend you read them, as their terms may differ from +the terms above. + +********************* + +``` diff --git a/Documentation/JavaDoc/legal/jqueryUI.md b/Documentation/JavaDoc/legal/jqueryUI.md new file mode 100644 index 000000000..8bda9d7a8 --- /dev/null +++ b/Documentation/JavaDoc/legal/jqueryUI.md @@ -0,0 +1,49 @@ +## jQuery UI v1.13.2 + +### jQuery UI License +``` +Copyright jQuery Foundation and other contributors, https://jquery.org/ + +This software consists of voluntary contributions made by many +individuals. For exact contribution history, see the revision history +available at https://github.com/jquery/jquery-ui + +The following license applies to all parts of this software except as +documented below: + +==== + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +==== + +Copyright and related rights for sample code are waived via CC0. Sample +code is defined as all source code contained within the demos directory. + +CC0: http://creativecommons.org/publicdomain/zero/1.0/ + +==== + +All files located in the node_modules and external directories are +externally maintained libraries used by this software which have their +own licenses; we recommend you read them, as their terms may differ from +the terms above. + +``` diff --git a/Documentation/JavaDoc/link.svg b/Documentation/JavaDoc/link.svg new file mode 100644 index 000000000..dadef51c5 --- /dev/null +++ b/Documentation/JavaDoc/link.svg @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/Documentation/JavaDoc/member-search-index.js b/Documentation/JavaDoc/member-search-index.js new file mode 100644 index 000000000..edeb4db62 --- /dev/null +++ b/Documentation/JavaDoc/member-search-index.js @@ -0,0 +1 @@ +memberSearchIndex = [{"p":"GUI","c":"GUI_NotesWindow","l":"close()"},{"p":"GUI","c":"GUI_NotesWindow","l":"getButton()"},{"p":"GUI","c":"GUI_MenuItemsBatch","l":"getItems()"},{"p":"GUI","c":"GUI_NotesWindow","l":"getNotes()"},{"p":"GUI","c":"GUI_AnalysisTab","l":"getPane()"},{"p":"GUI","c":"GUI_CanTab","l":"getPane()"},{"p":"GUI","c":"GUI_DocTab","l":"getPane()"},{"p":"GUI","c":"GUI_ECTab","l":"getPane()"},{"p":"GUI","c":"GUI_EDTab","l":"getPane()"},{"p":"GUI","c":"GUI_ReviewTab","l":"getPane()"},{"p":"GUI","c":"GUI_MenuItemsBatch","l":"getProblems()"},{"p":"GUI","c":"GUI_AnalysisTab","l":"GUI_AnalysisTab()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_CanTab","l":"GUI_CanTab()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_DocTab","l":"GUI_DocTab()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_ECTab","l":"GUI_ECTab()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_EDTab","l":"GUI_EDTab()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_JGAAPAboutWindow","l":"GUI_JGAAPAboutWindow()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_MainWindow","l":"GUI_MainWindow()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_MenuItemsBatch","l":"GUI_MenuItemsBatch()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_NotesWindow","l":"GUI_NotesWindow()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_ReviewTab","l":"GUI_ReviewTab()","u":"%3Cinit%3E()"},{"p":"GUI","c":"GUI_NotesWindow","l":"hide()"},{"p":"GUI","c":"GUI_MainWindow","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"GUI","c":"GUI_JGAAPAboutWindow","l":"show()"},{"p":"GUI","c":"GUI_NotesWindow","l":"show()"},{"p":"GUI","c":"GUI_MainWindow","l":"start(Stage)","u":"start(javafx.stage.Stage)"}];updateSearchResults(); \ No newline at end of file diff --git a/Documentation/JavaDoc/module-search-index.js b/Documentation/JavaDoc/module-search-index.js new file mode 100644 index 000000000..0d59754fc --- /dev/null +++ b/Documentation/JavaDoc/module-search-index.js @@ -0,0 +1 @@ +moduleSearchIndex = [];updateSearchResults(); \ No newline at end of file diff --git a/Documentation/JavaDoc/overview-tree.html b/Documentation/JavaDoc/overview-tree.html new file mode 100644 index 000000000..1ea61978c --- /dev/null +++ b/Documentation/JavaDoc/overview-tree.html @@ -0,0 +1,83 @@ + + + + +Class Hierarchy + + + + + + + + + + + + + + +
+ +
+
+
+

Hierarchy For All Packages

+
+Package Hierarchies: + +
+

Class Hierarchy

+ +
+
+
+
+ + diff --git a/Documentation/JavaDoc/package-search-index.js b/Documentation/JavaDoc/package-search-index.js new file mode 100644 index 000000000..08ca64938 --- /dev/null +++ b/Documentation/JavaDoc/package-search-index.js @@ -0,0 +1 @@ +packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"l":"GUI"}];updateSearchResults(); \ No newline at end of file diff --git a/Documentation/JavaDoc/resources/glass.png b/Documentation/JavaDoc/resources/glass.png new file mode 100644 index 000000000..a7f591f46 Binary files /dev/null and b/Documentation/JavaDoc/resources/glass.png differ diff --git a/Documentation/JavaDoc/resources/x.png b/Documentation/JavaDoc/resources/x.png new file mode 100644 index 000000000..30548a756 Binary files /dev/null and b/Documentation/JavaDoc/resources/x.png differ diff --git a/Documentation/JavaDoc/script-dir/jquery-3.6.1.min.js b/Documentation/JavaDoc/script-dir/jquery-3.6.1.min.js new file mode 100644 index 000000000..2c69bc908 --- /dev/null +++ b/Documentation/JavaDoc/script-dir/jquery-3.6.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.6.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),v={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&v(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!y||!y.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ve(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ye(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ve(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],y=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||y.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||y.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||y.push(".#.+[+~]"),e.querySelectorAll("\\\f"),y.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),y=y.length&&new RegExp(y.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),v=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&v(p,e)?-1:t==C||t.ownerDocument==p&&v(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!y||!y.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),v.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",v.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",v.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),v.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(v.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return B(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=_e(v.pixelPosition,function(e,t){if(t)return t=Be(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return B(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=x(e||this.defaultElement||this)[0],this.element=x(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=x(),this.hoverable=x(),this.focusable=x(),this.classesElementLookup={},e!==this&&(x.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=x(e.style?e.ownerDocument:e.document||e),this.window=x(this.document[0].defaultView||this.document[0].parentWindow)),this.options=x.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:x.noop,_create:x.noop,_init:x.noop,destroy:function(){var i=this;this._destroy(),x.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:x.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return x.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=x.widget.extend({},this.options[t]),n=0;n
"),i=e.children()[0];return x("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.widthC(E(s),E(n))?o.important="horizontal":o.important="vertical",c.using.call(this,t,o)}),l.offset(x.extend(u,{using:t}))})},x.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,l=s-o,a=o+e.collisionWidth-n-s;e.collisionWidth>n?0n?0",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=x(t.target),i=x(x.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){x.contains(this.element[0],x.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=x(t.target).closest(".ui-menu-item"),i=x(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=x(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case x.ui.keyCode.PAGE_UP:this.previousPage(t);break;case x.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case x.ui.keyCode.HOME:this._move("first","first",t);break;case x.ui.keyCode.END:this._move("last","last",t);break;case x.ui.keyCode.UP:this.previous(t);break;case x.ui.keyCode.DOWN:this.next(t);break;case x.ui.keyCode.LEFT:this.collapse(t);break;case x.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case x.ui.keyCode.ENTER:case x.ui.keyCode.SPACE:this._activate(t);break;case x.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=x(this),e=t.prev(),i=x("").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=x(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!x.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(x.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(x.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=x("
    ").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){x(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("
    ").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==x.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=x("
    ",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||x.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?x(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(x.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=x.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length").append(x("
    ").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),x.extend(x.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(x.ui.autocomplete.escapeRegex(e),"i");return x.grep(t,function(t){return i.test(t.label||t.value||t)})}}),x.widget("ui.autocomplete",x.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1").text(e))},100))}});x.ui.autocomplete}); \ No newline at end of file diff --git a/Documentation/JavaDoc/script.js b/Documentation/JavaDoc/script.js new file mode 100644 index 000000000..f1a0f2564 --- /dev/null +++ b/Documentation/JavaDoc/script.js @@ -0,0 +1,253 @@ +/* + * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. + * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ + +var moduleSearchIndex; +var packageSearchIndex; +var typeSearchIndex; +var memberSearchIndex; +var tagSearchIndex; + +var oddRowColor = "odd-row-color"; +var evenRowColor = "even-row-color"; +var sortAsc = "sort-asc"; +var sortDesc = "sort-desc"; +var tableTab = "table-tab"; +var activeTableTab = "active-table-tab"; + +function loadScripts(doc, tag) { + createElem(doc, tag, 'search.js'); + + createElem(doc, tag, 'module-search-index.js'); + createElem(doc, tag, 'package-search-index.js'); + createElem(doc, tag, 'type-search-index.js'); + createElem(doc, tag, 'member-search-index.js'); + createElem(doc, tag, 'tag-search-index.js'); +} + +function createElem(doc, tag, path) { + var script = doc.createElement(tag); + var scriptElement = doc.getElementsByTagName(tag)[0]; + script.src = pathtoroot + path; + scriptElement.parentNode.insertBefore(script, scriptElement); +} + +// Helper for making content containing release names comparable lexicographically +function makeComparable(s) { + return s.toLowerCase().replace(/(\d+)/g, + function(n, m) { + return ("000" + m).slice(-4); + }); +} + +// Switches between two styles depending on a condition +function toggleStyle(classList, condition, trueStyle, falseStyle) { + if (condition) { + classList.remove(falseStyle); + classList.add(trueStyle); + } else { + classList.remove(trueStyle); + classList.add(falseStyle); + } +} + +// Sorts the rows in a table lexicographically by the content of a specific column +function sortTable(header, columnIndex, columns) { + var container = header.parentElement; + var descending = header.classList.contains(sortAsc); + container.querySelectorAll("div.table-header").forEach( + function(header) { + header.classList.remove(sortAsc); + header.classList.remove(sortDesc); + } + ) + var cells = container.children; + var rows = []; + for (var i = columns; i < cells.length; i += columns) { + rows.push(Array.prototype.slice.call(cells, i, i + columns)); + } + var comparator = function(a, b) { + var ka = makeComparable(a[columnIndex].textContent); + var kb = makeComparable(b[columnIndex].textContent); + if (ka < kb) + return descending ? 1 : -1; + if (ka > kb) + return descending ? -1 : 1; + return 0; + }; + var sorted = rows.sort(comparator); + var visible = 0; + sorted.forEach(function(row) { + if (row[0].style.display !== 'none') { + var isEvenRow = visible++ % 2 === 0; + } + row.forEach(function(cell) { + toggleStyle(cell.classList, isEvenRow, evenRowColor, oddRowColor); + container.appendChild(cell); + }) + }); + toggleStyle(header.classList, descending, sortDesc, sortAsc); +} + +// Toggles the visibility of a table category in all tables in a page +function toggleGlobal(checkbox, selected, columns) { + var display = checkbox.checked ? '' : 'none'; + document.querySelectorAll("div.table-tabs").forEach(function(t) { + var id = t.parentElement.getAttribute("id"); + var selectedClass = id + "-tab" + selected; + // if selected is empty string it selects all uncategorized entries + var selectUncategorized = !Boolean(selected); + var visible = 0; + document.querySelectorAll('div.' + id) + .forEach(function(elem) { + if (selectUncategorized) { + if (elem.className.indexOf(selectedClass) === -1) { + elem.style.display = display; + } + } else if (elem.classList.contains(selectedClass)) { + elem.style.display = display; + } + if (elem.style.display === '') { + var isEvenRow = visible++ % (columns * 2) < columns; + toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor); + } + }); + var displaySection = visible === 0 ? 'none' : ''; + t.parentElement.style.display = displaySection; + document.querySelector("li#contents-" + id).style.display = displaySection; + }) +} + +// Shows the elements of a table belonging to a specific category +function show(tableId, selected, columns) { + if (tableId !== selected) { + document.querySelectorAll('div.' + tableId + ':not(.' + selected + ')') + .forEach(function(elem) { + elem.style.display = 'none'; + }); + } + document.querySelectorAll('div.' + selected) + .forEach(function(elem, index) { + elem.style.display = ''; + var isEvenRow = index % (columns * 2) < columns; + toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor); + }); + updateTabs(tableId, selected); +} + +function updateTabs(tableId, selected) { + document.querySelector('div#' + tableId +' .summary-table') + .setAttribute('aria-labelledby', selected); + document.querySelectorAll('button[id^="' + tableId + '"]') + .forEach(function(tab, index) { + if (selected === tab.id || (tableId === selected && index === 0)) { + tab.className = activeTableTab; + tab.setAttribute('aria-selected', true); + tab.setAttribute('tabindex',0); + } else { + tab.className = tableTab; + tab.setAttribute('aria-selected', false); + tab.setAttribute('tabindex',-1); + } + }); +} + +function switchTab(e) { + var selected = document.querySelector('[aria-selected=true]'); + if (selected) { + if ((e.keyCode === 37 || e.keyCode === 38) && selected.previousSibling) { + // left or up arrow key pressed: move focus to previous tab + selected.previousSibling.click(); + selected.previousSibling.focus(); + e.preventDefault(); + } else if ((e.keyCode === 39 || e.keyCode === 40) && selected.nextSibling) { + // right or down arrow key pressed: move focus to next tab + selected.nextSibling.click(); + selected.nextSibling.focus(); + e.preventDefault(); + } + } +} + +var updateSearchResults = function() {}; + +function indexFilesLoaded() { + return moduleSearchIndex + && packageSearchIndex + && typeSearchIndex + && memberSearchIndex + && tagSearchIndex; +} +// Copy the contents of the local snippet to the clipboard +function copySnippet(button) { + copyToClipboard(button.nextElementSibling.innerText); + switchCopyLabel(button, button.firstElementChild); +} +function copyToClipboard(content) { + var textarea = document.createElement("textarea"); + textarea.style.height = 0; + document.body.appendChild(textarea); + textarea.value = content; + textarea.select(); + document.execCommand("copy"); + document.body.removeChild(textarea); +} +function switchCopyLabel(button, span) { + var copied = span.getAttribute("data-copied"); + button.classList.add("visible"); + var initialLabel = span.innerHTML; + span.innerHTML = copied; + setTimeout(function() { + button.classList.remove("visible"); + setTimeout(function() { + if (initialLabel !== copied) { + span.innerHTML = initialLabel; + } + }, 100); + }, 1900); +} +// Workaround for scroll position not being included in browser history (8249133) +document.addEventListener("DOMContentLoaded", function(e) { + var contentDiv = document.querySelector("div.flex-content"); + window.addEventListener("popstate", function(e) { + if (e.state !== null) { + contentDiv.scrollTop = e.state; + } + }); + window.addEventListener("hashchange", function(e) { + history.replaceState(contentDiv.scrollTop, document.title); + }); + var timeoutId; + contentDiv.addEventListener("scroll", function(e) { + if (timeoutId) { + clearTimeout(timeoutId); + } + timeoutId = setTimeout(function() { + history.replaceState(contentDiv.scrollTop, document.title); + }, 100); + }); + if (!location.hash) { + history.replaceState(contentDiv.scrollTop, document.title); + } +}); diff --git a/Documentation/JavaDoc/search-page.js b/Documentation/JavaDoc/search-page.js new file mode 100644 index 000000000..e4da097d9 --- /dev/null +++ b/Documentation/JavaDoc/search-page.js @@ -0,0 +1,284 @@ +/* + * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved. + * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ + +"use strict"; +$(function() { + var copy = $("#page-search-copy"); + var expand = $("#page-search-expand"); + var searchLink = $("span#page-search-link"); + var redirect = $("input#search-redirect"); + function setSearchUrlTemplate() { + var href = document.location.href.split(/[#?]/)[0]; + href += "?q=" + "%s"; + if (redirect.is(":checked")) { + href += "&r=1"; + } + searchLink.html(href); + copy[0].onmouseenter(); + } + function copyLink(e) { + copyToClipboard(this.previousSibling.innerText); + switchCopyLabel(this, this.lastElementChild); + } + copy.click(copyLink); + copy[0].onmouseenter = function() {}; + redirect.click(setSearchUrlTemplate); + setSearchUrlTemplate(); + copy.prop("disabled", false); + redirect.prop("disabled", false); + expand.click(function (e) { + var searchInfo = $("div.page-search-info"); + if(this.parentElement.hasAttribute("open")) { + searchInfo.attr("style", "border-width: 0;"); + } else { + searchInfo.attr("style", "border-width: 1px;").height(searchInfo.prop("scrollHeight")); + } + }); +}); +$(window).on("load", function() { + var input = $("#page-search-input"); + var reset = $("#page-search-reset"); + var notify = $("#page-search-notify"); + var resultSection = $("div#result-section"); + var resultContainer = $("div#result-container"); + var searchTerm = ""; + var activeTab = ""; + var fixedTab = false; + var visibleTabs = []; + var feelingLucky = false; + function renderResults(result) { + if (!result.length) { + notify.html(messages.noResult); + } else if (result.length === 1) { + notify.html(messages.oneResult); + } else { + notify.html(messages.manyResults.replace("{0}", result.length)); + } + resultContainer.empty(); + var r = { + "types": [], + "members": [], + "packages": [], + "modules": [], + "searchTags": [] + }; + for (var i in result) { + var item = result[i]; + var arr = r[item.category]; + arr.push(item); + } + if (!activeTab || r[activeTab].length === 0 || !fixedTab) { + Object.keys(r).reduce(function(prev, curr) { + if (r[curr].length > 0 && r[curr][0].score > prev) { + activeTab = curr; + return r[curr][0].score; + } + return prev; + }, 0); + } + if (feelingLucky && activeTab) { + notify.html(messages.redirecting) + var firstItem = r[activeTab][0]; + window.location = getURL(firstItem.indexItem, firstItem.category); + return; + } + if (result.length > 20) { + if (searchTerm[searchTerm.length - 1] === ".") { + if (activeTab === "types" && r["members"].length > r["types"].length) { + activeTab = "members"; + } else if (activeTab === "packages" && r["types"].length > r["packages"].length) { + activeTab = "types"; + } + } + } + var categoryCount = Object.keys(r).reduce(function(prev, curr) { + return prev + (r[curr].length > 0 ? 1 : 0); + }, 0); + visibleTabs = []; + var tabContainer = $("
    ").appendTo(resultContainer); + for (var key in r) { + var id = "#result-tab-" + key.replace("searchTags", "search_tags"); + if (r[key].length) { + var count = r[key].length >= 1000 ? "999+" : r[key].length; + if (result.length > 20 && categoryCount > 1) { + var button = $("").appendTo(tabContainer); + button.click(key, function(e) { + fixedTab = true; + renderResult(e.data, $(this)); + }); + visibleTabs.push(key); + } else { + $("" + categories[key] + + " (" + count + ")").appendTo(tabContainer); + renderTable(key, r[key]).appendTo(resultContainer); + tabContainer = $("
    ").appendTo(resultContainer); + + } + } + } + if (activeTab && result.length > 20 && categoryCount > 1) { + $("button#result-tab-" + activeTab).addClass("active-table-tab"); + renderTable(activeTab, r[activeTab]).appendTo(resultContainer); + } + resultSection.show(); + function renderResult(category, button) { + activeTab = category; + setSearchUrl(); + resultContainer.find("div.summary-table").remove(); + renderTable(activeTab, r[activeTab]).appendTo(resultContainer); + button.siblings().removeClass("active-table-tab"); + button.addClass("active-table-tab"); + } + } + function selectTab(category) { + $("button#result-tab-" + category).click(); + } + function renderTable(category, items) { + var table = $("
    ") + .addClass(category === "modules" + ? "one-column-search-results" + : "two-column-search-results"); + var col1, col2; + if (category === "modules") { + col1 = "Module"; + } else if (category === "packages") { + col1 = "Module"; + col2 = "Package"; + } else if (category === "types") { + col1 = "Package"; + col2 = "Class" + } else if (category === "members") { + col1 = "Class"; + col2 = "Member"; + } else if (category === "searchTags") { + col1 = "Location"; + col2 = "Name"; + } + $("
    " + col1 + "
    ").appendTo(table); + if (category !== "modules") { + $("
    " + col2 + "
    ").appendTo(table); + } + $.each(items, function(index, item) { + var rowColor = index % 2 ? "odd-row-color" : "even-row-color"; + renderItem(item, table, rowColor); + }); + return table; + } + function renderItem(item, table, rowColor) { + var label = getHighlightedText(item.input, item.boundaries, item.prefix.length, item.input.length); + var link = $("") + .attr("href", getURL(item.indexItem, item.category)) + .attr("tabindex", "0") + .addClass("search-result-link") + .html(label); + var container = getHighlightedText(item.input, item.boundaries, 0, item.prefix.length - 1); + if (item.category === "searchTags") { + container = item.indexItem.h || ""; + } + if (item.category !== "modules") { + $("
    ").html(container).addClass("col-plain").addClass(rowColor).appendTo(table); + } + $("
    ").html(link).addClass("col-last").addClass(rowColor).appendTo(table); + } + var timeout; + function schedulePageSearch() { + if (timeout) { + clearTimeout(timeout); + } + timeout = setTimeout(function () { + doPageSearch() + }, 100); + } + function doPageSearch() { + setSearchUrl(); + var term = searchTerm = input.val().trim(); + if (term === "") { + notify.html(messages.enterTerm); + activeTab = ""; + fixedTab = false; + resultContainer.empty(); + resultSection.hide(); + } else { + notify.html(messages.searching); + doSearch({ term: term, maxResults: 1200 }, renderResults); + } + } + function setSearchUrl() { + var query = input.val().trim(); + var url = document.location.pathname; + if (query) { + url += "?q=" + encodeURI(query); + if (activeTab && fixedTab) { + url += "&c=" + activeTab; + } + } + history.replaceState({query: query}, "", url); + } + input.on("input", function(e) { + feelingLucky = false; + schedulePageSearch(); + }); + $(document).keydown(function(e) { + if ((e.ctrlKey || e.metaKey) && (e.key === "ArrowLeft" || e.key === "ArrowRight")) { + if (activeTab && visibleTabs.length > 1) { + var idx = visibleTabs.indexOf(activeTab); + idx += e.key === "ArrowLeft" ? visibleTabs.length - 1 : 1; + selectTab(visibleTabs[idx % visibleTabs.length]); + return false; + } + } + }); + reset.click(function() { + notify.html(messages.enterTerm); + resultSection.hide(); + activeTab = ""; + fixedTab = false; + resultContainer.empty(); + input.val('').focus(); + setSearchUrl(); + }); + input.prop("disabled", false); + reset.prop("disabled", false); + + var urlParams = new URLSearchParams(window.location.search); + if (urlParams.has("q")) { + input.val(urlParams.get("q")) + } + if (urlParams.has("c")) { + activeTab = urlParams.get("c"); + fixedTab = true; + } + if (urlParams.get("r")) { + feelingLucky = true; + } + if (input.val()) { + doPageSearch(); + } else { + notify.html(messages.enterTerm); + } + input.select().focus(); +}); diff --git a/Documentation/JavaDoc/search.html b/Documentation/JavaDoc/search.html new file mode 100644 index 000000000..171c24687 --- /dev/null +++ b/Documentation/JavaDoc/search.html @@ -0,0 +1,71 @@ + + + + +Search + + + + + + + + + + + + + + +
    + +
    +
    +

    Search

    +
    + + +
    +Additional resources +
    +
    +
    +

    The help page provides an introduction to the scope and syntax of JavaDoc search.

    +

    You can use the <ctrl> or <cmd> keys in combination with the left and right arrow keys to switch between result tabs in this page.

    +

    The URL template below may be used to configure this page as a search engine in browsers that support this feature. It has been tested to work in Google Chrome and Mozilla Firefox. Note that other browsers may not support this feature or require a different URL format.

    +link +

    + +

    +
    +

    Loading search index...

    + +
    +
    +
    + + diff --git a/Documentation/JavaDoc/search.js b/Documentation/JavaDoc/search.js new file mode 100644 index 000000000..4ca955773 --- /dev/null +++ b/Documentation/JavaDoc/search.js @@ -0,0 +1,458 @@ +/* + * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +"use strict"; +const messages = { + enterTerm: "Enter a search term", + noResult: "No results found", + oneResult: "Found one result", + manyResults: "Found {0} results", + loading: "Loading search index...", + searching: "Searching...", + redirecting: "Redirecting to first result...", + linkIcon: "Link icon", + linkToSection: "Link to this section" +} +const categories = { + modules: "Modules", + packages: "Packages", + types: "Classes and Interfaces", + members: "Members", + searchTags: "Search Tags" +}; +const highlight = "$&"; +const NO_MATCH = {}; +const MAX_RESULTS = 300; +function checkUnnamed(name, separator) { + return name === "" || !name ? "" : name + separator; +} +function escapeHtml(str) { + return str.replace(//g, ">"); +} +function getHighlightedText(str, boundaries, from, to) { + var start = from; + var text = ""; + for (var i = 0; i < boundaries.length; i += 2) { + var b0 = boundaries[i]; + var b1 = boundaries[i + 1]; + if (b0 >= to || b1 <= from) { + continue; + } + text += escapeHtml(str.slice(start, Math.max(start, b0))); + text += ""; + text += escapeHtml(str.slice(Math.max(start, b0), Math.min(to, b1))); + text += ""; + start = Math.min(to, b1); + } + text += escapeHtml(str.slice(start, to)); + return text; +} +function getURLPrefix(item, category) { + var urlPrefix = ""; + var slash = "/"; + if (category === "modules") { + return item.l + slash; + } else if (category === "packages" && item.m) { + return item.m + slash; + } else if (category === "types" || category === "members") { + if (item.m) { + urlPrefix = item.m + slash; + } else { + $.each(packageSearchIndex, function(index, it) { + if (it.m && item.p === it.l) { + urlPrefix = it.m + slash; + } + }); + } + } + return urlPrefix; +} +function getURL(item, category) { + if (item.url) { + return item.url; + } + var url = getURLPrefix(item, category); + if (category === "modules") { + url += "module-summary.html"; + } else if (category === "packages") { + if (item.u) { + url = item.u; + } else { + url += item.l.replace(/\./g, '/') + "/package-summary.html"; + } + } else if (category === "types") { + if (item.u) { + url = item.u; + } else { + url += checkUnnamed(item.p, "/").replace(/\./g, '/') + item.l + ".html"; + } + } else if (category === "members") { + url += checkUnnamed(item.p, "/").replace(/\./g, '/') + item.c + ".html" + "#"; + if (item.u) { + url += item.u; + } else { + url += item.l; + } + } else if (category === "searchTags") { + url += item.u; + } + item.url = url; + return url; +} +function createMatcher(term, camelCase) { + if (camelCase && !isUpperCase(term)) { + return null; // no need for camel-case matcher for lower case query + } + var pattern = ""; + var upperCase = []; + term.trim().split(/\s+/).forEach(function(w, index, array) { + var tokens = w.split(/(?=[A-Z,.()<>?[\/])/); + for (var i = 0; i < tokens.length; i++) { + var s = tokens[i]; + // ',' and '?' are the only delimiters commonly followed by space in java signatures + pattern += "(" + $.ui.autocomplete.escapeRegex(s).replace(/[,?]/g, "$&\\s*?") + ")"; + upperCase.push(false); + var isWordToken = /\w$/.test(s); + if (isWordToken) { + if (i === tokens.length - 1 && index < array.length - 1) { + // space in query string matches all delimiters + pattern += "(.*?)"; + upperCase.push(isUpperCase(s[0])); + } else { + if (!camelCase && isUpperCase(s) && s.length === 1) { + pattern += "()"; + } else { + pattern += "([a-z0-9$<>?[\\]]*?)"; + } + upperCase.push(isUpperCase(s[0])); + } + } else { + pattern += "()"; + upperCase.push(false); + } + } + }); + var re = new RegExp(pattern, "gi"); + re.upperCase = upperCase; + return re; +} +function findMatch(matcher, input, startOfName, endOfName) { + var from = startOfName; + matcher.lastIndex = from; + var match = matcher.exec(input); + // Expand search area until we get a valid result or reach the beginning of the string + while (!match || match.index + match[0].length < startOfName || endOfName < match.index) { + if (from === 0) { + return NO_MATCH; + } + from = input.lastIndexOf(".", from - 2) + 1; + matcher.lastIndex = from; + match = matcher.exec(input); + } + var boundaries = []; + var matchEnd = match.index + match[0].length; + var score = 5; + var start = match.index; + var prevEnd = -1; + for (var i = 1; i < match.length; i += 2) { + var isUpper = isUpperCase(input[start]); + var isMatcherUpper = matcher.upperCase[i]; + // capturing groups come in pairs, match and non-match + boundaries.push(start, start + match[i].length); + // make sure groups are anchored on a left word boundary + var prevChar = input[start - 1] || ""; + var nextChar = input[start + 1] || ""; + if (start !== 0 && !/[\W_]/.test(prevChar) && !/[\W_]/.test(input[start])) { + if (isUpper && (isLowerCase(prevChar) || isLowerCase(nextChar))) { + score -= 0.1; + } else if (isMatcherUpper && start === prevEnd) { + score -= isUpper ? 0.1 : 1.0; + } else { + return NO_MATCH; + } + } + prevEnd = start + match[i].length; + start += match[i].length + match[i + 1].length; + + // lower score for parts of the name that are missing + if (match[i + 1] && prevEnd < endOfName) { + score -= rateNoise(match[i + 1]); + } + } + // lower score if a type name contains unmatched camel-case parts + if (input[matchEnd - 1] !== "." && endOfName > matchEnd) + score -= rateNoise(input.slice(matchEnd, endOfName)); + score -= rateNoise(input.slice(0, Math.max(startOfName, match.index))); + + if (score <= 0) { + return NO_MATCH; + } + return { + input: input, + score: score, + boundaries: boundaries + }; +} +function isUpperCase(s) { + return s !== s.toLowerCase(); +} +function isLowerCase(s) { + return s !== s.toUpperCase(); +} +function rateNoise(str) { + return (str.match(/([.(])/g) || []).length / 5 + + (str.match(/([A-Z]+)/g) || []).length / 10 + + str.length / 20; +} +function doSearch(request, response) { + var term = request.term.trim(); + var maxResults = request.maxResults || MAX_RESULTS; + if (term.length === 0) { + return this.close(); + } + var matcher = { + plainMatcher: createMatcher(term, false), + camelCaseMatcher: createMatcher(term, true) + } + var indexLoaded = indexFilesLoaded(); + + function getPrefix(item, category) { + switch (category) { + case "packages": + return checkUnnamed(item.m, "/"); + case "types": + return checkUnnamed(item.p, "."); + case "members": + return checkUnnamed(item.p, ".") + item.c + "."; + default: + return ""; + } + } + function useQualifiedName(category) { + switch (category) { + case "packages": + return /[\s/]/.test(term); + case "types": + case "members": + return /[\s.]/.test(term); + default: + return false; + } + } + function searchIndex(indexArray, category) { + var matches = []; + if (!indexArray) { + if (!indexLoaded) { + matches.push({ l: messages.loading, category: category }); + } + return matches; + } + $.each(indexArray, function (i, item) { + var prefix = getPrefix(item, category); + var simpleName = item.l; + var qualifiedName = prefix + simpleName; + var useQualified = useQualifiedName(category); + var input = useQualified ? qualifiedName : simpleName; + var startOfName = useQualified ? prefix.length : 0; + var endOfName = category === "members" && input.indexOf("(", startOfName) > -1 + ? input.indexOf("(", startOfName) : input.length; + var m = findMatch(matcher.plainMatcher, input, startOfName, endOfName); + if (m === NO_MATCH && matcher.camelCaseMatcher) { + m = findMatch(matcher.camelCaseMatcher, input, startOfName, endOfName); + } + if (m !== NO_MATCH) { + m.indexItem = item; + m.prefix = prefix; + m.category = category; + if (!useQualified) { + m.input = qualifiedName; + m.boundaries = m.boundaries.map(function(b) { + return b + prefix.length; + }); + } + matches.push(m); + } + return true; + }); + return matches.sort(function(e1, e2) { + return e2.score - e1.score; + }).slice(0, maxResults); + } + + var result = searchIndex(moduleSearchIndex, "modules") + .concat(searchIndex(packageSearchIndex, "packages")) + .concat(searchIndex(typeSearchIndex, "types")) + .concat(searchIndex(memberSearchIndex, "members")) + .concat(searchIndex(tagSearchIndex, "searchTags")); + + if (!indexLoaded) { + updateSearchResults = function() { + doSearch(request, response); + } + } else { + updateSearchResults = function() {}; + } + response(result); +} +// JQuery search menu implementation +$.widget("custom.catcomplete", $.ui.autocomplete, { + _create: function() { + this._super(); + this.widget().menu("option", "items", "> .result-item"); + // workaround for search result scrolling + this.menu._scrollIntoView = function _scrollIntoView( item ) { + var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight; + if ( this._hasScroll() ) { + borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0; + paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0; + offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop; + scroll = this.activeMenu.scrollTop(); + elementHeight = this.activeMenu.height() - 26; + itemHeight = item.outerHeight(); + + if ( offset < 0 ) { + this.activeMenu.scrollTop( scroll + offset ); + } else if ( offset + itemHeight > elementHeight ) { + this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight ); + } + } + }; + }, + _renderMenu: function(ul, items) { + var currentCategory = ""; + var widget = this; + widget.menu.bindings = $(); + $.each(items, function(index, item) { + if (item.category && item.category !== currentCategory) { + ul.append("
  • " + categories[item.category] + "
  • "); + currentCategory = item.category; + } + var li = widget._renderItemData(ul, item); + if (item.category) { + li.attr("aria-label", categories[item.category] + " : " + item.l); + } else { + li.attr("aria-label", item.l); + } + li.attr("class", "result-item"); + }); + ul.append(""); + }, + _renderItem: function(ul, item) { + var li = $("
  • ").appendTo(ul); + var div = $("
    ").appendTo(li); + var label = item.l + ? item.l + : getHighlightedText(item.input, item.boundaries, 0, item.input.length); + var idx = item.indexItem; + if (item.category === "searchTags" && idx && idx.h) { + if (idx.d) { + div.html(label + " (" + idx.h + ")
    " + + idx.d + "
    "); + } else { + div.html(label + " (" + idx.h + ")"); + } + } else { + div.html(label); + } + return li; + } +}); +$(function() { + var expanded = false; + var windowWidth; + function collapse() { + if (expanded) { + $("div#navbar-top").removeAttr("style"); + $("button#navbar-toggle-button") + .removeClass("expanded") + .attr("aria-expanded", "false"); + expanded = false; + } + } + $("button#navbar-toggle-button").click(function (e) { + if (expanded) { + collapse(); + } else { + var navbar = $("div#navbar-top"); + navbar.height(navbar.prop("scrollHeight")); + $("button#navbar-toggle-button") + .addClass("expanded") + .attr("aria-expanded", "true"); + expanded = true; + windowWidth = window.innerWidth; + } + }); + $("ul.sub-nav-list-small li a").click(collapse); + $("input#search-input").focus(collapse); + $("main").click(collapse); + $("section[id] > :header, :header[id], :header:has(a[id])").each(function(idx, el) { + // Create anchor links for headers with an associated id attribute + var hdr = $(el); + var id = hdr.attr("id") || hdr.parent("section").attr("id") || hdr.children("a").attr("id"); + if (id) { + hdr.append(" " + messages.linkIcon +""); + } + }); + $(window).on("orientationchange", collapse).on("resize", function(e) { + if (expanded && windowWidth !== window.innerWidth) collapse(); + }); + var search = $("#search-input"); + var reset = $("#reset-button"); + search.catcomplete({ + minLength: 1, + delay: 200, + source: doSearch, + response: function(event, ui) { + if (!ui.content.length) { + ui.content.push({ l: messages.noResult }); + } else { + $("#search-input").empty(); + } + }, + autoFocus: true, + focus: function(event, ui) { + return false; + }, + position: { + collision: "flip" + }, + select: function(event, ui) { + if (ui.item.indexItem) { + var url = getURL(ui.item.indexItem, ui.item.category); + window.location.href = pathtoroot + url; + $("#search-input").focus(); + } + } + }); + search.val(''); + search.prop("disabled", false); + reset.prop("disabled", false); + reset.click(function() { + search.val('').focus(); + }); + search.focus(); +}); diff --git a/Documentation/JavaDoc/stylesheet.css b/Documentation/JavaDoc/stylesheet.css new file mode 100644 index 000000000..f71489f86 --- /dev/null +++ b/Documentation/JavaDoc/stylesheet.css @@ -0,0 +1,1272 @@ +/* + * Javadoc style sheet + */ + +@import url('resources/fonts/dejavu.css'); + +/* + * These CSS custom properties (variables) define the core color and font + * properties used in this stylesheet. + */ +:root { + /* body, block and code fonts */ + --body-font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif; + --block-font-family: 'DejaVu Serif', Georgia, "Times New Roman", Times, serif; + --code-font-family: 'DejaVu Sans Mono', monospace; + /* Base font sizes for body and code elements */ + --body-font-size: 14px; + --code-font-size: 14px; + /* Text colors for body and block elements */ + --body-text-color: #353833; + --block-text-color: #474747; + /* Background colors for various structural elements */ + --body-background-color: #ffffff; + --section-background-color: #f8f8f8; + --detail-background-color: #ffffff; + /* Colors for navigation bar and table captions */ + --navbar-background-color: #4D7A97; + --navbar-text-color: #ffffff; + /* Background color for subnavigation and various headers */ + --subnav-background-color: #dee3e9; + /* Background and text colors for selected tabs and navigation items */ + --selected-background-color: #f8981d; + --selected-text-color: #253441; + --selected-link-color: #1f389c; + /* Background colors for generated tables */ + --even-row-color: #ffffff; + --odd-row-color: #eeeeef; + /* Text color for page title */ + --title-color: #2c4557; + /* Text colors for links */ + --link-color: #4A6782; + --link-color-active: #bb7a2a; + /* Snippet colors */ + --snippet-background-color: #ebecee; + --snippet-text-color: var(--block-text-color); + --snippet-highlight-color: #f7c590; + /* Border colors for structural elements and user defined tables */ + --border-color: #ededed; + --table-border-color: #000000; + /* Search input colors */ + --search-input-background-color: #ffffff; + --search-input-text-color: #000000; + --search-input-placeholder-color: #909090; + /* Highlight color for active search tag target */ + --search-tag-highlight-color: #ffff00; + /* Adjustments for icon and active background colors of copy-to-clipboard buttons */ + --copy-icon-brightness: 100%; + --copy-button-background-color-active: rgba(168, 168, 176, 0.3); + /* Colors for invalid tag notifications */ + --invalid-tag-background-color: #ffe6e6; + --invalid-tag-text-color: #000000; +} +/* + * Styles for individual HTML elements. + * + * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular + * HTML element throughout the page. + */ +body { + background-color:var(--body-background-color); + color:var(--body-text-color); + font-family:var(--body-font-family); + font-size:var(--body-font-size); + margin:0; + padding:0; + height:100%; + width:100%; +} +iframe { + margin:0; + padding:0; + height:100%; + width:100%; + overflow-y:scroll; + border:none; +} +a:link, a:visited { + text-decoration:none; + color:var(--link-color); +} +a[href]:hover, a[href]:focus { + text-decoration:none; + color:var(--link-color-active); +} +pre { + font-family:var(--code-font-family); + font-size:1em; +} +h1 { + font-size:1.428em; +} +h2 { + font-size:1.285em; +} +h3 { + font-size:1.14em; +} +h4 { + font-size:1.072em; +} +h5 { + font-size:1.001em; +} +h6 { + font-size:0.93em; +} +/* Disable font boosting for selected elements */ +h1, h2, h3, h4, h5, h6, div.member-signature { + max-height: 1000em; +} +ul { + list-style-type:disc; +} +code, tt { + font-family:var(--code-font-family); +} +:not(h1, h2, h3, h4, h5, h6) > code, +:not(h1, h2, h3, h4, h5, h6) > tt { + font-size:var(--code-font-size); + padding-top:4px; + margin-top:8px; + line-height:1.4em; +} +dt code { + font-family:var(--code-font-family); + font-size:1em; + padding-top:4px; +} +.summary-table dt code { + font-family:var(--code-font-family); + font-size:1em; + vertical-align:top; + padding-top:4px; +} +sup { + font-size:8px; +} +button { + font-family: var(--body-font-family); + font-size: 1em; +} +/* + * Styles for HTML generated by javadoc. + * + * These are style classes that are used by the standard doclet to generate HTML documentation. + */ + +/* + * Styles for document title and copyright. + */ +.about-language { + float:right; + padding:0 21px 8px 8px; + font-size:0.915em; + margin-top:-9px; + height:2.9em; +} +.legal-copy { + margin-left:.5em; +} +/* + * Styles for navigation bar. + */ +@media screen { + div.flex-box { + position:fixed; + display:flex; + flex-direction:column; + height: 100%; + width: 100%; + } + header.flex-header { + flex: 0 0 auto; + } + div.flex-content { + flex: 1 1 auto; + overflow-y: auto; + } +} +.top-nav { + background-color:var(--navbar-background-color); + color:var(--navbar-text-color); + float:left; + width:100%; + clear:right; + min-height:2.8em; + padding:10px 0 0 0; + overflow:hidden; + font-size:0.857em; +} +button#navbar-toggle-button { + display:none; +} +ul.sub-nav-list-small { + display: none; +} +.sub-nav { + background-color:var(--subnav-background-color); + float:left; + width:100%; + overflow:hidden; + font-size:0.857em; +} +.sub-nav div { + clear:left; + float:left; + padding:6px; + text-transform:uppercase; +} +.sub-nav .sub-nav-list { + padding-top:4px; +} +ul.nav-list { + display:block; + margin:0 25px 0 0; + padding:0; +} +ul.sub-nav-list { + float:left; + margin:0 25px 0 0; + padding:0; +} +ul.nav-list li { + list-style:none; + float:left; + padding: 5px 6px; + text-transform:uppercase; +} +.sub-nav .nav-list-search { + float:right; + margin:0; + padding:6px; + clear:none; + text-align:right; + position:relative; +} +ul.sub-nav-list li { + list-style:none; + float:left; +} +.top-nav a:link, .top-nav a:active, .top-nav a:visited { + color:var(--navbar-text-color); + text-decoration:none; + text-transform:uppercase; +} +.top-nav a:hover { + color:var(--link-color-active); +} +.nav-bar-cell1-rev { + background-color:var(--selected-background-color); + color:var(--selected-text-color); + margin: auto 5px; +} +.skip-nav { + position:absolute; + top:auto; + left:-9999px; + overflow:hidden; +} +/* + * Hide navigation links and search box in print layout + */ +@media print { + ul.nav-list, div.sub-nav { + display:none; + } +} +/* + * Styles for page header. + */ +.title { + color:var(--title-color); + margin:10px 0; +} +.sub-title { + margin:5px 0 0 0; +} +ul.contents-list { + margin: 0 0 15px 0; + padding: 0; + list-style: none; +} +ul.contents-list li { + font-size:0.93em; +} +/* + * Styles for headings. + */ +body.class-declaration-page .summary h2, +body.class-declaration-page .details h2, +body.class-use-page h2, +body.module-declaration-page .block-list h2 { + font-style: italic; + padding:0; + margin:15px 0; +} +body.class-declaration-page .summary h3, +body.class-declaration-page .details h3, +body.class-declaration-page .summary .inherited-list h2 { + background-color:var(--subnav-background-color); + border:1px solid var(--border-color); + margin:0 0 6px -8px; + padding:7px 5px; +} +/* + * Styles for page layout containers. + */ +main { + clear:both; + padding:10px 20px; + position:relative; +} +dl.notes > dt { + font-family: var(--body-font-family); + font-size:0.856em; + font-weight:bold; + margin:10px 0 0 0; + color:var(--body-text-color); +} +dl.notes > dd { + margin:5px 10px 10px 0; + font-size:1em; + font-family:var(--block-font-family) +} +dl.name-value > dt { + margin-left:1px; + font-size:1.1em; + display:inline; + font-weight:bold; +} +dl.name-value > dd { + margin:0 0 0 1px; + font-size:1.1em; + display:inline; +} +/* + * Styles for lists. + */ +li.circle { + list-style:circle; +} +ul.horizontal li { + display:inline; + font-size:0.9em; +} +div.inheritance { + margin:0; + padding:0; +} +div.inheritance div.inheritance { + margin-left:2em; +} +ul.block-list, +ul.details-list, +ul.member-list, +ul.summary-list { + margin:10px 0 10px 0; + padding:0; +} +ul.block-list > li, +ul.details-list > li, +ul.member-list > li, +ul.summary-list > li { + list-style:none; + margin-bottom:15px; + line-height:1.4; +} +ul.ref-list { + padding:0; + margin:0; +} +ul.ref-list > li { + list-style:none; +} +.summary-table dl, .summary-table dl dt, .summary-table dl dd { + margin-top:0; + margin-bottom:1px; +} +ul.tag-list, ul.tag-list-long { + padding-left: 0; + list-style: none; +} +ul.tag-list li { + display: inline; +} +ul.tag-list li:not(:last-child):after, +ul.tag-list-long li:not(:last-child):after +{ + content: ", "; + white-space: pre-wrap; +} +ul.preview-feature-list { + list-style: none; + margin:0; + padding:0.1em; + line-height: 1.6em; +} +/* + * Styles for tables. + */ +.summary-table, .details-table { + width:100%; + border-spacing:0; + border:1px solid var(--border-color); + border-top:0; + padding:0; +} +.caption { + position:relative; + text-align:left; + background-repeat:no-repeat; + color:var(--selected-text-color); + clear:none; + overflow:hidden; + padding: 10px 0 0 1px; + margin:0; +} +.caption a:link, .caption a:visited { + color:var(--selected-link-color); +} +.caption a:hover, +.caption a:active { + color:var(--navbar-text-color); +} +.caption span { + font-weight:bold; + white-space:nowrap; + padding:5px 12px 7px 12px; + display:inline-block; + float:left; + background-color:var(--selected-background-color); + border: none; + height:16px; +} +div.table-tabs { + padding:10px 0 0 1px; + margin:10px 0 0 0; +} +div.table-tabs > button { + border: none; + cursor: pointer; + padding: 5px 12px 7px 12px; + font-weight: bold; + margin-right: 8px; +} +div.table-tabs > .active-table-tab { + background: var(--selected-background-color); + color: var(--selected-text-color); +} +div.table-tabs > button.table-tab { + background: var(--navbar-background-color); + color: var(--navbar-text-color); +} +.two-column-search-results { + display: grid; + grid-template-columns: minmax(400px, max-content) minmax(400px, auto); +} +div.checkboxes { + line-height: 2em; +} +div.checkboxes > span { + margin-left: 10px; +} +div.checkboxes > label { + margin-left: 8px; + white-space: nowrap; +} +div.checkboxes > label > input { + margin: 0 2px; +} +.two-column-summary { + display: grid; + grid-template-columns: minmax(25%, max-content) minmax(25%, auto); +} +.three-column-summary { + display: grid; + grid-template-columns: minmax(15%, max-content) minmax(20%, max-content) minmax(20%, auto); +} +.three-column-release-summary { + display: grid; + grid-template-columns: minmax(40%, max-content) minmax(10%, max-content) minmax(40%, auto); +} +.four-column-summary { + display: grid; + grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, max-content) minmax(15%, auto); +} +@media screen and (max-width: 1000px) { + .four-column-summary { + display: grid; + grid-template-columns: minmax(15%, max-content) minmax(15%, auto); + } +} +@media screen and (max-width: 800px) { + .two-column-search-results { + display: grid; + grid-template-columns: minmax(40%, max-content) minmax(40%, auto); + } + .three-column-summary { + display: grid; + grid-template-columns: minmax(10%, max-content) minmax(25%, auto); + } + .three-column-release-summary { + display: grid; + grid-template-columns: minmax(70%, max-content) minmax(30%, max-content) + } + .three-column-summary .col-last, + .three-column-release-summary .col-last{ + grid-column-end: span 2; + } +} +@media screen and (max-width: 600px) { + .two-column-summary { + display: grid; + grid-template-columns: 1fr; + } +} +.summary-table > div, .details-table > div { + text-align:left; + padding: 8px 3px 3px 7px; + overflow-x: auto; + scrollbar-width: thin; +} +.col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name { + vertical-align:top; + padding-right:0; + padding-top:8px; + padding-bottom:3px; +} +.table-header { + background:var(--subnav-background-color); + font-weight: bold; +} +/* Sortable table columns */ +.table-header[onclick] { + cursor: pointer; +} +.table-header[onclick]::after { + content:""; + display:inline-block; + background-image:url('data:image/svg+xml; utf8, \ + \ + '); + background-size:100% 100%; + width:9px; + height:14px; + margin-left:4px; + margin-bottom:-3px; +} +.table-header[onclick].sort-asc::after { + background-image:url('data:image/svg+xml; utf8, \ + \ + \ + '); + +} +.table-header[onclick].sort-desc::after { + background-image:url('data:image/svg+xml; utf8, \ + \ + \ + '); +} +.col-first, .col-first { + font-size:0.93em; +} +.col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last { + font-size:0.93em; +} +.col-first, .col-second, .col-constructor-name { + vertical-align:top; + overflow: auto; +} +.col-last { + white-space:normal; +} +.col-first a:link, .col-first a:visited, +.col-second a:link, .col-second a:visited, +.col-first a:link, .col-first a:visited, +.col-second a:link, .col-second a:visited, +.col-constructor-name a:link, .col-constructor-name a:visited, +.col-summary-item-name a:link, .col-summary-item-name a:visited { + font-weight:bold; +} +.even-row-color, .even-row-color .table-header { + background-color:var(--even-row-color); +} +.odd-row-color, .odd-row-color .table-header { + background-color:var(--odd-row-color); +} +/* + * Styles for contents. + */ +div.block { + font-size:var(--body-font-size); + font-family:var(--block-font-family); +} +.col-last div { + padding-top:0; +} +.col-last a { + padding-bottom:3px; +} +.module-signature, +.package-signature, +.type-signature, +.member-signature { + font-family:var(--code-font-family); + font-size:1em; + margin:14px 0; + white-space: pre-wrap; +} +.module-signature, +.package-signature, +.type-signature { + margin-top: 0; +} +.member-signature .type-parameters-long, +.member-signature .parameters, +.member-signature .exceptions { + display: inline-block; + vertical-align: top; + white-space: pre; +} +.member-signature .type-parameters { + white-space: normal; +} +/* + * Styles for formatting effect. + */ +.source-line-no { + /* Color of line numbers in source pages can be set via custom property below */ + color:var(--source-linenumber-color, green); + padding:0 30px 0 0; +} +.block { + display:block; + margin:0 10px 5px 0; + color:var(--block-text-color); +} +.deprecated-label, .description-from-type-label, .implementation-label, .member-name-link, +.module-label-in-package, .module-label-in-type, .package-label-in-type, +.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label { + font-weight:bold; +} +.deprecation-comment, .help-footnote, .preview-comment { + font-style:italic; +} +.deprecation-block { + font-size:1em; + font-family:var(--block-font-family); + border-style:solid; + border-width:thin; + border-radius:10px; + padding:10px; + margin-bottom:10px; + margin-right:10px; + display:inline-block; +} +.preview-block { + font-size:1em; + font-family:var(--block-font-family); + border-style:solid; + border-width:thin; + border-radius:10px; + padding:10px; + margin-bottom:10px; + margin-right:10px; + display:inline-block; +} +div.block div.deprecation-comment { + font-style:normal; +} +details.invalid-tag, span.invalid-tag { + font-size:1em; + font-family:var(--block-font-family); + color: var(--invalid-tag-text-color); + background: var(--invalid-tag-background-color); + border: thin solid var(--table-border-color); + border-radius:2px; + padding: 2px 4px; + display:inline-block; +} +details summary { + cursor: pointer; +} +/* + * Styles specific to HTML5 elements. + */ +main, nav, header, footer, section { + display:block; +} +/* + * Styles for javadoc search. + */ +.ui-state-active { + /* Overrides the color of selection used in jQuery UI */ + background: var(--selected-background-color); + border: 1px solid var(--selected-background-color); + color: var(--selected-text-color); +} +.ui-autocomplete-category { + font-weight:bold; + font-size:15px; + padding:7px 0 7px 3px; + background-color:var(--navbar-background-color); + color:var(--navbar-text-color); +} +.ui-autocomplete { + max-height:85%; + max-width:65%; + overflow-y:auto; + overflow-x:auto; + scrollbar-width: thin; + white-space:nowrap; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); +} +ul.ui-autocomplete { + position:fixed; + z-index:1; + background-color: var(--body-background-color); +} +ul.ui-autocomplete li { + float:left; + clear:both; + min-width:100%; +} +ul.ui-autocomplete li.ui-static-link { + position:sticky; + bottom:0; + left:0; + background: var(--subnav-background-color); + padding: 5px 0; + font-family: var(--body-font-family); + font-size: 0.93em; + font-weight: bolder; + z-index: 2; +} +li.ui-static-link a, li.ui-static-link a:visited { + text-decoration:none; + color:var(--link-color); + float:right; + margin-right:20px; +} +.ui-autocomplete .result-item { + font-size: inherit; +} +.ui-autocomplete .result-highlight { + font-weight:bold; +} +#search-input, #page-search-input { + background-image:url('resources/glass.png'); + background-size:13px; + background-repeat:no-repeat; + background-position:2px 3px; + background-color: var(--search-input-background-color); + color: var(--search-input-text-color); + border-color: var(--border-color); + padding-left:20px; + width: 250px; + margin: 0; +} +#search-input { + margin-left: 4px; +} +#reset-button { + background-color: transparent; + background-image:url('resources/x.png'); + background-repeat:no-repeat; + background-size:contain; + border:0; + border-radius:0; + width:12px; + height:12px; + position:absolute; + right:12px; + top:10px; + font-size:0; +} +::placeholder { + color:var(--search-input-placeholder-color); + opacity: 1; +} +.search-tag-desc-result { + font-style:italic; + font-size:11px; +} +.search-tag-holder-result { + font-style:italic; + font-size:12px; +} +.search-tag-result:target { + background-color:var(--search-tag-highlight-color); +} +details.page-search-details { + display: inline-block; +} +div#result-container { + font-size: 1em; +} +div#result-container a.search-result-link { + padding: 0; + margin: 4px 0; + width: 100%; +} +#result-container .result-highlight { + font-weight:bolder; +} +.page-search-info { + background-color: var(--subnav-background-color); + border-radius: 3px; + border: 0 solid var(--border-color); + padding: 0 8px; + overflow: hidden; + height: 0; + transition: all 0.2s ease; +} +div.table-tabs > button.table-tab { + background: var(--navbar-background-color); + color: var(--navbar-text-color); +} +.page-search-header { + padding: 5px 12px 7px 12px; + font-weight: bold; + margin-right: 3px; + background-color:var(--navbar-background-color); + color:var(--navbar-text-color); + display: inline-block; +} +button.page-search-header { + border: none; + cursor: pointer; +} +span#page-search-link { + text-decoration: underline; +} +.module-graph span, .sealed-graph span { + display:none; + position:absolute; +} +.module-graph:hover span, .sealed-graph:hover span { + display:block; + margin: -100px 0 0 100px; + z-index: 1; +} +.inherited-list { + margin: 10px 0 10px 0; +} +section.class-description { + line-height: 1.4; +} +.summary section[class$="-summary"], .details section[class$="-details"], +.class-uses .detail, .serialized-class-details { + padding: 0 20px 5px 10px; + border: 1px solid var(--border-color); + background-color: var(--section-background-color); +} +.inherited-list, section[class$="-details"] .detail { + padding:0 0 5px 8px; + background-color:var(--detail-background-color); + border:none; +} +.vertical-separator { + padding: 0 5px; +} +ul.help-section-list { + margin: 0; +} +ul.help-subtoc > li { + display: inline-block; + padding-right: 5px; + font-size: smaller; +} +ul.help-subtoc > li::before { + content: "\2022" ; + padding-right:2px; +} +.help-note { + font-style: italic; +} +/* + * Indicator icon for external links. + */ +main a[href*="://"]::after { + content:""; + display:inline-block; + background-image:url('data:image/svg+xml; utf8, \ + \ + \ + '); + background-size:100% 100%; + width:7px; + height:7px; + margin-left:2px; + margin-bottom:4px; +} +main a[href*="://"]:hover::after, +main a[href*="://"]:focus::after { + background-image:url('data:image/svg+xml; utf8, \ + \ + \ + '); +} +/* + * Styles for header/section anchor links + */ +a.anchor-link { + opacity: 0; + transition: opacity 0.1s; +} +:hover > a.anchor-link { + opacity: 80%; +} +a.anchor-link:hover, +a.anchor-link:focus-visible, +a.anchor-link.visible { + opacity: 100%; +} +a.anchor-link > img { + width: 0.9em; + height: 0.9em; +} +/* + * Styles for copy-to-clipboard buttons + */ +button.copy { + opacity: 70%; + border: none; + border-radius: 3px; + position: relative; + background:none; + transition: opacity 0.3s; + cursor: pointer; +} +:hover > button.copy { + opacity: 80%; +} +button.copy:hover, +button.copy:active, +button.copy:focus-visible, +button.copy.visible { + opacity: 100%; +} +button.copy img { + position: relative; + background: none; + filter: brightness(var(--copy-icon-brightness)); +} +button.copy:active { + background-color: var(--copy-button-background-color-active); +} +button.copy span { + color: var(--body-text-color); + position: relative; + top: -0.1em; + transition: all 0.1s; + font-size: 0.76rem; + line-height: 1.2em; + opacity: 0; +} +button.copy:hover span, +button.copy:focus-visible span, +button.copy.visible span { + opacity: 100%; +} +/* search page copy button */ +button#page-search-copy { + margin-left: 0.4em; + padding:0.3em; + top:0.13em; +} +button#page-search-copy img { + width: 1.2em; + height: 1.2em; + padding: 0.01em 0; + top: 0.15em; +} +button#page-search-copy span { + color: var(--body-text-color); + line-height: 1.2em; + padding: 0.2em; + top: -0.18em; +} +div.page-search-info:hover button#page-search-copy span { + opacity: 100%; +} +/* snippet copy button */ +button.snippet-copy { + position: absolute; + top: 6px; + right: 6px; + height: 1.7em; + padding: 2px; +} +button.snippet-copy img { + width: 18px; + height: 18px; + padding: 0.05em 0; +} +button.snippet-copy span { + line-height: 1.2em; + padding: 0.2em; + position: relative; + top: -0.5em; +} +div.snippet-container:hover button.snippet-copy span { + opacity: 100%; +} +/* + * Styles for user-provided tables. + * + * borderless: + * No borders, vertical margins, styled caption. + * This style is provided for use with existing doc comments. + * In general, borderless tables should not be used for layout purposes. + * + * plain: + * Plain borders around table and cells, vertical margins, styled caption. + * Best for small tables or for complex tables for tables with cells that span + * rows and columns, when the "striped" style does not work well. + * + * striped: + * Borders around the table and vertical borders between cells, striped rows, + * vertical margins, styled caption. + * Best for tables that have a header row, and a body containing a series of simple rows. + */ + +table.borderless, +table.plain, +table.striped { + margin-top: 10px; + margin-bottom: 10px; +} +table.borderless > caption, +table.plain > caption, +table.striped > caption { + font-weight: bold; + font-size: smaller; +} +table.borderless th, table.borderless td, +table.plain th, table.plain td, +table.striped th, table.striped td { + padding: 2px 5px; +} +table.borderless, +table.borderless > thead > tr > th, table.borderless > tbody > tr > th, table.borderless > tr > th, +table.borderless > thead > tr > td, table.borderless > tbody > tr > td, table.borderless > tr > td { + border: none; +} +table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless > tr { + background-color: transparent; +} +table.plain { + border-collapse: collapse; + border: 1px solid var(--table-border-color); +} +table.plain > thead > tr, table.plain > tbody tr, table.plain > tr { + background-color: transparent; +} +table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th, +table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td { + border: 1px solid var(--table-border-color); +} +table.striped { + border-collapse: collapse; + border: 1px solid var(--table-border-color); +} +table.striped > thead { + background-color: var(--subnav-background-color); +} +table.striped > thead > tr > th, table.striped > thead > tr > td { + border: 1px solid var(--table-border-color); +} +table.striped > tbody > tr:nth-child(even) { + background-color: var(--odd-row-color) +} +table.striped > tbody > tr:nth-child(odd) { + background-color: var(--even-row-color) +} +table.striped > tbody > tr > th, table.striped > tbody > tr > td { + border-left: 1px solid var(--table-border-color); + border-right: 1px solid var(--table-border-color); +} +table.striped > tbody > tr > th { + font-weight: normal; +} +/** + * Tweak style for small screens. + */ +@media screen and (max-width: 920px) { + header.flex-header { + max-height: 100vh; + overflow-y: auto; + } + div#navbar-top { + height: 2.8em; + transition: height 0.35s ease; + } + ul.nav-list { + display: block; + width: 40%; + float:left; + clear: left; + margin: 10px 0 0 0; + padding: 0; + } + ul.nav-list li { + float: none; + padding: 6px; + margin-left: 10px; + margin-top: 2px; + } + ul.sub-nav-list-small { + display:block; + height: 100%; + width: 50%; + float: right; + clear: right; + background-color: var(--subnav-background-color); + color: var(--body-text-color); + margin: 6px 0 0 0; + padding: 0; + } + ul.sub-nav-list-small ul { + padding-left: 20px; + } + ul.sub-nav-list-small a:link, ul.sub-nav-list-small a:visited { + color:var(--link-color); + } + ul.sub-nav-list-small a:hover { + color:var(--link-color-active); + } + ul.sub-nav-list-small li { + list-style:none; + float:none; + padding: 6px; + margin-top: 1px; + text-transform:uppercase; + } + ul.sub-nav-list-small > li { + margin-left: 10px; + } + ul.sub-nav-list-small li p { + margin: 5px 0; + } + div#navbar-sub-list { + display: none; + } + .top-nav a:link, .top-nav a:active, .top-nav a:visited { + display: block; + } + button#navbar-toggle-button { + width: 3.4em; + height: 2.8em; + background-color: transparent; + display: block; + float: left; + border: 0; + margin: 0 10px; + cursor: pointer; + font-size: 10px; + } + button#navbar-toggle-button .nav-bar-toggle-icon { + display: block; + width: 24px; + height: 3px; + margin: 1px 0 4px 0; + border-radius: 2px; + transition: all 0.1s; + background-color: var(--navbar-text-color); + } + button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(1) { + transform: rotate(45deg); + transform-origin: 10% 10%; + width: 26px; + } + button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(2) { + opacity: 0; + } + button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(3) { + transform: rotate(-45deg); + transform-origin: 10% 90%; + width: 26px; + } +} +@media screen and (max-width: 800px) { + .about-language { + padding-right: 16px; + } + ul.nav-list li { + margin-left: 5px; + } + ul.sub-nav-list-small > li { + margin-left: 5px; + } + main { + padding: 10px; + } + .summary section[class$="-summary"], .details section[class$="-details"], + .class-uses .detail, .serialized-class-details { + padding: 0 8px 5px 8px; + } + body { + -webkit-text-size-adjust: none; + } +} +@media screen and (max-width: 400px) { + .about-language { + font-size: 10px; + padding-right: 12px; + } +} +@media screen and (max-width: 400px) { + .nav-list-search { + width: 94%; + } + #search-input, #page-search-input { + width: 70%; + } +} +@media screen and (max-width: 320px) { + .nav-list-search > label { + display: none; + } + .nav-list-search { + width: 90%; + } + #search-input, #page-search-input { + width: 80%; + } +} + +pre.snippet { + background-color: var(--snippet-background-color); + color: var(--snippet-text-color); + padding: 10px; + margin: 12px 0; + overflow: auto; + white-space: pre; +} +div.snippet-container { + position: relative; +} +@media screen and (max-width: 800px) { + pre.snippet { + padding-top: 26px; + } + button.snippet-copy { + top: 4px; + right: 4px; + } +} +pre.snippet .italic { + font-style: italic; +} +pre.snippet .bold { + font-weight: bold; +} +pre.snippet .highlighted { + background-color: var(--snippet-highlight-color); + border-radius: 10%; +} diff --git a/Documentation/JavaDoc/tag-search-index.js b/Documentation/JavaDoc/tag-search-index.js new file mode 100644 index 000000000..0367dae65 --- /dev/null +++ b/Documentation/JavaDoc/tag-search-index.js @@ -0,0 +1 @@ +tagSearchIndex = [];updateSearchResults(); \ No newline at end of file diff --git a/Documentation/JavaDoc/type-search-index.js b/Documentation/JavaDoc/type-search-index.js new file mode 100644 index 000000000..fa0896410 --- /dev/null +++ b/Documentation/JavaDoc/type-search-index.js @@ -0,0 +1 @@ +typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"GUI","l":"GUI_AnalysisTab"},{"p":"GUI","l":"GUI_CanTab"},{"p":"GUI","l":"GUI_DocTab"},{"p":"GUI","l":"GUI_ECTab"},{"p":"GUI","l":"GUI_EDTab"},{"p":"GUI","l":"GUI_JGAAPAboutWindow"},{"p":"GUI","l":"GUI_MainWindow"},{"p":"GUI","l":"GUI_MenuItemsBatch"},{"p":"GUI","l":"GUI_NotesWindow"},{"p":"GUI","l":"GUI_ReviewTab"}];updateSearchResults(); \ No newline at end of file diff --git a/Documentation/Libaries.md b/Documentation/Libaries.md new file mode 100644 index 000000000..848e5be4a --- /dev/null +++ b/Documentation/Libaries.md @@ -0,0 +1,22 @@ +# Library Files + +## Online locations for download/update + +1. [commons-cli](https://commons.apache.org/proper/commons-cli/download_cli.cgi) +2. [edu.mit.jwi](https://projects.csail.mit.edu/jwi/) +3. [guava](https://github.com/google/guava/releases) +4. [javassist](http://www.javassist.org/) +5. [jscience](https://www.jscience.org/) +6. [log4j-api](https://logging.apache.org/log4j/2.x/download.html) +7. [log4j-core](https://logging.apache.org/log4j/2.x/download.html) +8. [reflections](https://github.com/ronmamo/reflections) +9. [stanford-ner](https://nlp.stanford.edu/software/CRF-NER.shtml#Download) +10. [stanford-postagger](https://nlp.stanford.edu/software/tagger.html#Download) +11. [tika-app](https://tika.apache.org/download.html) +12. [weka](https://sourceforge.net/projects/weka/files/) + +--- + +## WordSegment + +This file seems to be custom made for this project at somepoint in time - This is an assumption. diff --git a/docs/OSX_User_Guide.pdf b/Documentation/OSX_User_Guide.pdf similarity index 100% rename from docs/OSX_User_Guide.pdf rename to Documentation/OSX_User_Guide.pdf diff --git a/docs/authorship_attribution.md b/Documentation/authorship_attribution.md similarity index 100% rename from docs/authorship_attribution.md rename to Documentation/authorship_attribution.md diff --git a/docs/running_jgaap.md b/Documentation/running_jgaap.md similarity index 100% rename from docs/running_jgaap.md rename to Documentation/running_jgaap.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..0ad25db4b --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/README.md b/README.md index a3ba6559d..6d4ad2c08 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,28 @@ # ![JGAAP](logo.png) + ## Java Graphical Authorship Attribution Program + JGAAP is a tool to allow nonexperts to use cutting edge machine learning techniques on text attribution problems. JGAAP is developed by the [Evaluating Variation in Language (EVL) Lab](http://evllabs.com) at Duquesne University. ## Getting Started + * [Understanding Authorship Attribution](docs/authorship_attribution.md) * [Running your First Experiment](docs/running_jgaap.md) * [Running Large Experiments](docs/Experiment_Engine.pdf) * [Extending JGAAP](docs/modules.md) ## Download + Head over to our [releases page](https://github.com/evllabs/JGAAP/releases) to get the latest version of JGAAP. ## Support + If you need help with JGAAP, please review our forum of past help requests [here](https://groups.google.com/forum/#!forum/jgaap-support). You should always feel free to reach out to us at any time with questions or suggestions at [jgaap-support@googlegroups.com](mailto:jgaap-support@googlegroups.com). ## License -JGAAP has been released under the **AGPLv3.0** and a copy should be included with the source. If it has not been included, a copy can be found at + +JGAAP has been released under the **AGPLv3.0** and a copy should be included with the source. If it has not been included, a copy can be found at diff --git a/docs/javadoc/allclasses-frame.html b/docs/javadoc/allclasses-frame.html deleted file mode 100644 index d655cdba6..000000000 --- a/docs/javadoc/allclasses-frame.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - -All Classes - - - - -

    All Classes

    - - - diff --git a/docs/javadoc/allclasses-noframe.html b/docs/javadoc/allclasses-noframe.html deleted file mode 100644 index 70548b0d9..000000000 --- a/docs/javadoc/allclasses-noframe.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - -All Classes - - - - -

    All Classes

    - - - diff --git a/docs/javadoc/com/jgaap/ui/JGAAP_UI_MainForm.html b/docs/javadoc/com/jgaap/ui/JGAAP_UI_MainForm.html deleted file mode 100644 index 049d0c8c1..000000000 --- a/docs/javadoc/com/jgaap/ui/JGAAP_UI_MainForm.html +++ /dev/null @@ -1,394 +0,0 @@ - - - - - -JGAAP_UI_MainForm - - - - - - - - - - - -
    -
    com.jgaap.ui
    -

    Class JGAAP_UI_MainForm

    -
    -
    -
      -
    • java.lang.Object
    • -
    • -
        -
      • java.awt.Component
      • -
      • -
          -
        • java.awt.Container
        • -
        • -
            -
          • java.awt.Window
          • -
          • -
              -
            • java.awt.Frame
            • -
            • -
                -
              • javax.swing.JFrame
              • -
              • -
                  -
                • com.jgaap.ui.JGAAP_UI_MainForm
                • -
                -
              • -
              -
            • -
            -
          • -
          -
        • -
        -
      • -
      -
    • -
    -
    -
      -
    • -
      -
      All Implemented Interfaces:
      -
      java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants
      -
      -
      -
      -
      public class JGAAP_UI_MainForm
      -extends javax.swing.JFrame
      -
      See Also:
      Serialized Form
      -
    • -
    -
    -
    -
      -
    • - -
        -
      • - - -

        Nested Class Summary

        -
          -
        • - - -

          Nested classes/interfaces inherited from class java.awt.Window

          -java.awt.Window.Type
        • -
        -
          -
        • - - -

          Nested classes/interfaces inherited from class java.awt.Component

          -java.awt.Component.BaselineResizeBehavior
        • -
        -
      • -
      - -
        -
      • - - -

        Field Summary

        -
          -
        • - - -

          Fields inherited from class javax.swing.JFrame

          -EXIT_ON_CLOSE
        • -
        -
          -
        • - - -

          Fields inherited from class java.awt.Frame

          -CROSSHAIR_CURSOR, DEFAULT_CURSOR, E_RESIZE_CURSOR, HAND_CURSOR, ICONIFIED, MAXIMIZED_BOTH, MAXIMIZED_HORIZ, MAXIMIZED_VERT, MOVE_CURSOR, N_RESIZE_CURSOR, NE_RESIZE_CURSOR, NORMAL, NW_RESIZE_CURSOR, S_RESIZE_CURSOR, SE_RESIZE_CURSOR, SW_RESIZE_CURSOR, TEXT_CURSOR, W_RESIZE_CURSOR, WAIT_CURSOR
        • -
        -
          -
        • - - -

          Fields inherited from class java.awt.Component

          -BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
        • -
        -
          -
        • - - -

          Fields inherited from interface javax.swing.WindowConstants

          -DISPOSE_ON_CLOSE, DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE
        • -
        -
          -
        • - - -

          Fields inherited from interface java.awt.image.ImageObserver

          -ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
        • -
        -
      • -
      - -
        -
      • - - -

        Constructor Summary

        - - - - - - - - -
        Constructors 
        Constructor and Description
        JGAAP_UI_MainForm() -
        Creates new form JGAAP_UI_MainForm
        -
        -
      • -
      - -
        -
      • - - -

        Method Summary

        - - - - - - - - - - -
        Methods 
        Modifier and TypeMethod and Description
        booleanbrowseToURL(java.lang.String url) 
        -
          -
        • - - -

          Methods inherited from class javax.swing.JFrame

          -getAccessibleContext, getContentPane, getDefaultCloseOperation, getGlassPane, getGraphics, getJMenuBar, getLayeredPane, getRootPane, getTransferHandler, isDefaultLookAndFeelDecorated, remove, repaint, setContentPane, setDefaultCloseOperation, setDefaultLookAndFeelDecorated, setGlassPane, setIconImage, setJMenuBar, setLayeredPane, setLayout, setTransferHandler, update
        • -
        -
          -
        • - - -

          Methods inherited from class java.awt.Frame

          -addNotify, getCursorType, getExtendedState, getFrames, getIconImage, getMaximizedBounds, getMenuBar, getState, getTitle, isResizable, isUndecorated, remove, removeNotify, setBackground, setCursor, setExtendedState, setMaximizedBounds, setMenuBar, setOpacity, setResizable, setShape, setState, setTitle, setUndecorated
        • -
        -
          -
        • - - -

          Methods inherited from class java.awt.Window

          -addPropertyChangeListener, addPropertyChangeListener, addWindowFocusListener, addWindowListener, addWindowStateListener, applyResourceBundle, applyResourceBundle, createBufferStrategy, createBufferStrategy, dispose, getBackground, getBufferStrategy, getFocusableWindowState, getFocusCycleRootAncestor, getFocusOwner, getFocusTraversalKeys, getIconImages, getInputContext, getListeners, getLocale, getModalExclusionType, getMostRecentFocusOwner, getOpacity, getOwnedWindows, getOwner, getOwnerlessWindows, getShape, getToolkit, getType, getWarningString, getWindowFocusListeners, getWindowListeners, getWindows, getWindowStateListeners, hide, isActive, isAlwaysOnTop, isAlwaysOnTopSupported, isAutoRequestFocus, isFocusableWindow, isFocusCycleRoot, isFocused, isLocationByPlatform, isOpaque, isShowing, isValidateRoot, pack, paint, postEvent, removeWindowFocusListener, removeWindowListener, removeWindowStateListener, reshape, setAlwaysOnTop, setAutoRequestFocus, setBounds, setBounds, setCursor, setFocusableWindowState, setFocusCycleRoot, setIconImages, setLocation, setLocation, setLocationByPlatform, setLocationRelativeTo, setMinimumSize, setModalExclusionType, setSize, setSize, setType, setVisible, show, toBack, toFront
        • -
        -
          -
        • - - -

          Methods inherited from class java.awt.Container

          -add, add, add, add, add, addContainerListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalPolicy, getInsets, getLayout, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, layout, list, list, locate, minimumSize, paintComponents, preferredSize, print, printComponents, remove, removeAll, removeContainerListener, setComponentZOrder, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, transferFocusDownCycle, validate
        • -
        -
          -
        • - - -

          Methods inherited from class java.awt.Component

          -action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, dispatchEvent, enable, enable, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isPreferredSizeSet, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, prepareImage, prepareImage, printAll, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, requestFocus, requestFocusInWindow, resize, resize, revalidate, setComponentOrientation, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setMaximumSize, setName, setPreferredSize, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
        • -
        -
          -
        • - - -

          Methods inherited from class java.lang.Object

          -equals, getClass, hashCode, notify, notifyAll, wait, wait, wait
        • -
        -
          -
        • - - -

          Methods inherited from interface java.awt.MenuContainer

          -getFont, postEvent
        • -
        -
      • -
      -
    • -
    -
    -
    -
      -
    • - -
        -
      • - - -

        Constructor Detail

        - - - -
          -
        • -

          JGAAP_UI_MainForm

          -
          public JGAAP_UI_MainForm()
          -
          Creates new form JGAAP_UI_MainForm
          -
        • -
        -
      • -
      - -
        -
      • - - -

        Method Detail

        - - - -
          -
        • -

          browseToURL

          -
          public boolean browseToURL(java.lang.String url)
          -
        • -
        -
      • -
      -
    • -
    -
    -
    - - - - - - - diff --git a/docs/javadoc/com/jgaap/ui/class-use/JGAAP_UI_MainForm.html b/docs/javadoc/com/jgaap/ui/class-use/JGAAP_UI_MainForm.html deleted file mode 100644 index 51ae789b3..000000000 --- a/docs/javadoc/com/jgaap/ui/class-use/JGAAP_UI_MainForm.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -Uses of Class com.jgaap.ui.JGAAP_UI_MainForm - - - - - - - - - - -
    -

    Uses of Class
    com.jgaap.ui.JGAAP_UI_MainForm

    -
    -
    No usage of com.jgaap.ui.JGAAP_UI_MainForm
    - - - - - - diff --git a/docs/javadoc/com/jgaap/ui/package-frame.html b/docs/javadoc/com/jgaap/ui/package-frame.html deleted file mode 100644 index 21e104a6e..000000000 --- a/docs/javadoc/com/jgaap/ui/package-frame.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - -com.jgaap.ui - - - - -

    com.jgaap.ui

    -
    -

    Classes

    - -
    - - diff --git a/docs/javadoc/com/jgaap/ui/package-summary.html b/docs/javadoc/com/jgaap/ui/package-summary.html deleted file mode 100644 index 3cd750d9a..000000000 --- a/docs/javadoc/com/jgaap/ui/package-summary.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - -com.jgaap.ui - - - - - - - - - - -
    -

    Package com.jgaap.ui

    -
    -
    - -
    - - - - - - diff --git a/docs/javadoc/com/jgaap/ui/package-tree.html b/docs/javadoc/com/jgaap/ui/package-tree.html deleted file mode 100644 index f75f36874..000000000 --- a/docs/javadoc/com/jgaap/ui/package-tree.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - - -com.jgaap.ui Class Hierarchy - - - - - - - -
    - - - - - -
    - - -
    -

    Hierarchy For Package com.jgaap.ui

    -
    -
    -

    Class Hierarchy

    -
      -
    • java.lang.Object -
        -
      • java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable) -
          -
        • java.awt.Container -
            -
          • java.awt.Window (implements javax.accessibility.Accessible) -
              -
            • java.awt.Frame (implements java.awt.MenuContainer) -
                -
              • javax.swing.JFrame (implements javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants) - -
              • -
              -
            • -
            -
          • -
          -
        • -
        -
      • -
      -
    • -
    -
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/com/jgaap/ui/package-use.html b/docs/javadoc/com/jgaap/ui/package-use.html deleted file mode 100644 index de8c63ef1..000000000 --- a/docs/javadoc/com/jgaap/ui/package-use.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -Uses of Package com.jgaap.ui - - - - - - - -
    - - - - - -
    - - -
    -

    Uses of Package
    com.jgaap.ui

    -
    -
    No usage of com.jgaap.ui
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/constant-values.html b/docs/javadoc/constant-values.html deleted file mode 100644 index 01c29286f..000000000 --- a/docs/javadoc/constant-values.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -Constant Field Values - - - - - - - -
    - - - - - -
    - - -
    -

    Constant Field Values

    -

    Contents

    -
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/deprecated-list.html b/docs/javadoc/deprecated-list.html deleted file mode 100644 index dd9f2b0a8..000000000 --- a/docs/javadoc/deprecated-list.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - -Deprecated List - - - - - - - -
    - - - - - -
    - - -
    -

    Deprecated API

    -

    Contents

    -
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/help-doc.html b/docs/javadoc/help-doc.html deleted file mode 100644 index 98b82fb47..000000000 --- a/docs/javadoc/help-doc.html +++ /dev/null @@ -1,214 +0,0 @@ - - - - - -API Help - - - - - - - -
    - - - - - -
    - - -
    -

    How This API Document Is Organized

    -
    This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
    -
    -
    -
      -
    • -

      Package

      -

      Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:

      -
        -
      • Interfaces (italic)
      • -
      • Classes
      • -
      • Enums
      • -
      • Exceptions
      • -
      • Errors
      • -
      • Annotation Types
      • -
      -
    • -
    • -

      Class/Interface

      -

      Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:

      -
        -
      • Class inheritance diagram
      • -
      • Direct Subclasses
      • -
      • All Known Subinterfaces
      • -
      • All Known Implementing Classes
      • -
      • Class/interface declaration
      • -
      • Class/interface description
      • -
      -
        -
      • Nested Class Summary
      • -
      • Field Summary
      • -
      • Constructor Summary
      • -
      • Method Summary
      • -
      -
        -
      • Field Detail
      • -
      • Constructor Detail
      • -
      • Method Detail
      • -
      -

      Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.

      -
    • -
    • -

      Annotation Type

      -

      Each annotation type has its own separate page with the following sections:

      -
        -
      • Annotation Type declaration
      • -
      • Annotation Type description
      • -
      • Required Element Summary
      • -
      • Optional Element Summary
      • -
      • Element Detail
      • -
      -
    • -
    • -

      Enum

      -

      Each enum has its own separate page with the following sections:

      -
        -
      • Enum declaration
      • -
      • Enum description
      • -
      • Enum Constant Summary
      • -
      • Enum Constant Detail
      • -
      -
    • -
    • -

      Use

      -

      Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.

      -
    • -
    • -

      Tree (Class Hierarchy)

      -

      There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.

      -
        -
      • When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
      • -
      • When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
      • -
      -
    • -
    • -

      Deprecated API

      -

      The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.

      -
    • -
    • -

      Index

      -

      The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.

      -
    • -
    • -

      Prev/Next

      -

      These links take you to the next or previous class, interface, package, or related page.

      -
    • -
    • -

      Frames/No Frames

      -

      These links show and hide the HTML frames. All pages are available with or without frames.

      -
    • -
    • -

      All Classes

      -

      The All Classes link shows all classes and interfaces except non-static nested types.

      -
    • -
    • -

      Serialized Form

      -

      Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.

      -
    • -
    • -

      Constant Field Values

      -

      The Constant Field Values page lists the static final fields and their values.

      -
    • -
    -This help file applies to API documentation generated using the standard doclet.
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/index-files/index-1.html b/docs/javadoc/index-files/index-1.html deleted file mode 100644 index ce9648a50..000000000 --- a/docs/javadoc/index-files/index-1.html +++ /dev/null @@ -1,118 +0,0 @@ - - - - - -B-Index - - - - - - - -
    - - - - - -
    - - -
    B C J  - - -

    B

    -
    -
    browseToURL(String) - Method in class com.jgaap.ui.JGAAP_UI_MainForm
    -
     
    -
    -B C J 
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/index-files/index-2.html b/docs/javadoc/index-files/index-2.html deleted file mode 100644 index 0fd381d33..000000000 --- a/docs/javadoc/index-files/index-2.html +++ /dev/null @@ -1,118 +0,0 @@ - - - - - -C-Index - - - - - - - -
    - - - - - -
    - - -
    B C J  - - -

    C

    -
    -
    com.jgaap.ui - package com.jgaap.ui
    -
     
    -
    -B C J 
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/index-files/index-3.html b/docs/javadoc/index-files/index-3.html deleted file mode 100644 index 38d057d0e..000000000 --- a/docs/javadoc/index-files/index-3.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - -J-Index - - - - - - - -
    - - - - - -
    - - -
    B C J  - - -

    J

    -
    -
    JGAAP_UI_MainForm - Class in com.jgaap.ui
    -
     
    -
    JGAAP_UI_MainForm() - Constructor for class com.jgaap.ui.JGAAP_UI_MainForm
    -
    -
    Creates new form JGAAP_UI_MainForm
    -
    -
    -B C J 
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/index.html b/docs/javadoc/index.html deleted file mode 100644 index 003317485..000000000 --- a/docs/javadoc/index.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - -Generated Documentation (Untitled) - - - - - - -<noscript> -<div>JavaScript is disabled on your browser.</div> -</noscript> -<h2>Frame Alert</h2> -<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="com/jgaap/ui/package-summary.html">Non-frame version</a>.</p> - - - diff --git a/docs/javadoc/overview-tree.html b/docs/javadoc/overview-tree.html deleted file mode 100644 index 036c00798..000000000 --- a/docs/javadoc/overview-tree.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - -Class Hierarchy - - - - - - - -
    - - - - - -
    - - -
    -

    Hierarchy For All Packages

    -Package Hierarchies: - -
    -
    -

    Class Hierarchy

    -
      -
    • java.lang.Object -
        -
      • java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable) -
          -
        • java.awt.Container -
            -
          • java.awt.Window (implements javax.accessibility.Accessible) -
              -
            • java.awt.Frame (implements java.awt.MenuContainer) -
                -
              • javax.swing.JFrame (implements javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants) - -
              • -
              -
            • -
            -
          • -
          -
        • -
        -
      • -
      -
    • -
    -
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/package-list b/docs/javadoc/package-list deleted file mode 100644 index eaad1af52..000000000 --- a/docs/javadoc/package-list +++ /dev/null @@ -1 +0,0 @@ -com.jgaap.ui diff --git a/docs/javadoc/resources/background.gif b/docs/javadoc/resources/background.gif deleted file mode 100644 index f471940fd..000000000 Binary files a/docs/javadoc/resources/background.gif and /dev/null differ diff --git a/docs/javadoc/resources/tab.gif b/docs/javadoc/resources/tab.gif deleted file mode 100644 index 1a73a83be..000000000 Binary files a/docs/javadoc/resources/tab.gif and /dev/null differ diff --git a/docs/javadoc/resources/titlebar.gif b/docs/javadoc/resources/titlebar.gif deleted file mode 100644 index 17443b3e1..000000000 Binary files a/docs/javadoc/resources/titlebar.gif and /dev/null differ diff --git a/docs/javadoc/resources/titlebar_end.gif b/docs/javadoc/resources/titlebar_end.gif deleted file mode 100644 index 3ad78d461..000000000 Binary files a/docs/javadoc/resources/titlebar_end.gif and /dev/null differ diff --git a/docs/javadoc/serialized-form.html b/docs/javadoc/serialized-form.html deleted file mode 100644 index 5d10146e6..000000000 --- a/docs/javadoc/serialized-form.html +++ /dev/null @@ -1,965 +0,0 @@ - - - - - -Serialized Form - - - - - - - -
    - - - - - -
    - - -
    -

    Serialized Form

    -
    -
    -
      -
    • -

      Package com.jgaap.ui

      -
        -
      • - - -

        Class com.jgaap.ui.JGAAP_UI_AddAuthorDialog extends javax.swing.JDialog implements Serializable

        -
        -
        serialVersionUID:
        -
        1L
        -
        -
          -
        • - - -

          Serialized Fields

          -
            -
          • -

            FileChoser

            -
            javax.swing.JFileChooser FileChoser
            -
          • -
          • -

            JGAAP_API

            -
            com.jgaap.backend.API JGAAP_API
            -
          • -
          • -

            Edit_AuthorName

            -
            java.lang.String Edit_AuthorName
            -
          • -
          • -

            Filepath

            -
            java.lang.String Filepath
            -
          • -
          • -

            Edit_DocumentList

            -
            java.util.List<E> Edit_DocumentList
            -
          • -
          • -

            Edit_DocumentsToBeDeleted

            -
            java.util.List<E> Edit_DocumentsToBeDeleted
            -
          • -
          • -

            DocumentsTable_Model

            -
            javax.swing.table.DefaultTableModel DocumentsTable_Model
            -
          • -
          • -

            AddDocumentsButton

            -
            javax.swing.JButton AddDocumentsButton
            -
          • -
          • -

            AuthorTextField

            -
            javax.swing.JTextField AuthorTextField
            -
          • -
          • -

            CancelButton

            -
            javax.swing.JButton CancelButton
            -
          • -
          • -

            DocumentsTable

            -
            javax.swing.JTable DocumentsTable
            -
          • -
          • -

            OKButton

            -
            javax.swing.JButton OKButton
            -
          • -
          • -

            RemoveDocumentsButton

            -
            javax.swing.JButton RemoveDocumentsButton
            -
          • -
          • -

            jLabel1

            -
            javax.swing.JLabel jLabel1
            -
          • -
          • -

            jScrollPane1

            -
            javax.swing.JScrollPane jScrollPane1
            -
          • -
          -
        • -
        -
      • -
      • - - -

        Class com.jgaap.ui.JGAAP_UI_MainForm extends javax.swing.JFrame implements Serializable

        -
        -
        serialVersionUID:
        -
        1L
        -
        -
          -
        • - - -

          Serialized Fields

          -
            -
          • -

            NotesPage

            -
            com.jgaap.ui.JGAAP_UI_NotesDialog NotesPage
            -
          • -
          • -

            ResultsPage

            -
            com.jgaap.ui.JGAAP_UI_ResultsDialog ResultsPage
            -
          • -
          • -

            Notes

            -
            java.lang.String[] Notes
            -
          • -
          • -

            AnalysisMethodListBox_Model

            -
            javax.swing.DefaultListModel<E> AnalysisMethodListBox_Model
            -
          • -
          • -

            SelectedAnalysisMethodListBox_Model

            -
            javax.swing.DefaultListModel<E> SelectedAnalysisMethodListBox_Model
            -
          • -
          • -

            CanonicizerListBox_Model

            -
            javax.swing.DefaultListModel<E> CanonicizerListBox_Model
            -
          • -
          • -

            SelectedCanonicizerListBox_Model

            -
            javax.swing.DefaultListModel<E> SelectedCanonicizerListBox_Model
            -
          • -
          • -

            EventCullingListBox_Model

            -
            javax.swing.DefaultListModel<E> EventCullingListBox_Model
            -
          • -
          • -

            SelectedEventCullingListBox_Model

            -
            javax.swing.DefaultListModel<E> SelectedEventCullingListBox_Model
            -
          • -
          • -

            EventSetsListBox_Model

            -
            javax.swing.DefaultListModel<E> EventSetsListBox_Model
            -
          • -
          • -

            SelectedEventSetsListBox_Model

            -
            javax.swing.DefaultListModel<E> SelectedEventSetsListBox_Model
            -
          • -
          • -

            DistanceFunctionsListBox_Model

            -
            javax.swing.DefaultListModel<E> DistanceFunctionsListBox_Model
            -
          • -
          • -

            LanguageComboBox_Model

            -
            javax.swing.DefaultComboBoxModel<E> LanguageComboBox_Model
            -
          • -
          • -

            CanonicizerComboBoxModel

            -
            javax.swing.DefaultComboBoxModel<E> CanonicizerComboBoxModel
            -
          • -
          • -

            KnownAuthorsTree_Model

            -
            javax.swing.tree.DefaultTreeModel KnownAuthorsTree_Model
            -
          • -
          • -

            UnknownAuthorDocumentsTable_Model

            -
            javax.swing.table.DefaultTableModel UnknownAuthorDocumentsTable_Model
            -
          • -
          • -

            JGAAP_API

            -
            com.jgaap.backend.API JGAAP_API
            -
          • -
          • -

            FileChoser

            -
            javax.swing.JFileChooser FileChoser
            -
          • -
          • -

            filepath

            -
            java.lang.String filepath
            -
          • -
          • -

            CanonicizerMasterList

            -
            java.util.List<E> CanonicizerMasterList
            -
          • -
          • -

            EventDriverMasterList

            -
            java.util.List<E> EventDriverMasterList
            -
          • -
          • -

            AnalysisDriverMasterList

            -
            java.util.List<E> AnalysisDriverMasterList
            -
          • -
          • -

            DistanceFunctionsMasterList

            -
            java.util.List<E> DistanceFunctionsMasterList
            -
          • -
          • -

            EventCullersMasterList

            -
            java.util.List<E> EventCullersMasterList
            -
          • -
          • -

            LanguagesMasterList

            -
            java.util.List<E> LanguagesMasterList
            -
          • -
          • -

            SelectedEventDriverList

            -
            java.util.List<E> SelectedEventDriverList
            -
          • -
          • -

            SelectedEventCullersList

            -
            java.util.List<E> SelectedEventCullersList
            -
          • -
          • -

            SelectedAnalysisDriverList

            -
            java.util.List<E> SelectedAnalysisDriverList
            -
          • -
          • -

            SelectedCanonicizerList

            -
            java.util.List<E> SelectedCanonicizerList
            -
          • -
          • -

            docTypesList

            -
            java.util.List<E> docTypesList
            -
          • -
          • -

            UnknownDocumentList

            -
            java.util.List<E> UnknownDocumentList
            -
          • -
          • -

            KnownDocumentList

            -
            java.util.List<E> KnownDocumentList
            -
          • -
          • -

            DocumentList

            -
            java.util.List<E> DocumentList
            -
          • -
          • -

            AuthorList

            -
            java.util.List<E> AuthorList
            -
          • -
          • -

            AnalysisMethodPanel_AMParametersPanel

            -
            javax.swing.JPanel AnalysisMethodPanel_AMParametersPanel
            -
          • -
          • -

            AnalysisMethodPanel_AddAllAnalysisMethodsButton

            -
            javax.swing.JButton AnalysisMethodPanel_AddAllAnalysisMethodsButton
            -
          • -
          • -

            AnalysisMethodPanel_AddAnalysisMethodButton

            -
            javax.swing.JButton AnalysisMethodPanel_AddAnalysisMethodButton
            -
          • -
          • -

            AnalysisMethodPanel_AnalysisMethodDescriptionTextBox

            -
            javax.swing.JTextArea AnalysisMethodPanel_AnalysisMethodDescriptionTextBox
            -
          • -
          • -

            AnalysisMethodPanel_AnalysisMethodsListBox

            -
            javax.swing.JList<E> AnalysisMethodPanel_AnalysisMethodsListBox
            -
          • -
          • -

            AnalysisMethodPanel_DFParametersPanel

            -
            javax.swing.JPanel AnalysisMethodPanel_DFParametersPanel
            -
          • -
          • -

            AnalysisMethodPanel_DistanceFunctionDescriptionTextBox

            -
            javax.swing.JTextArea AnalysisMethodPanel_DistanceFunctionDescriptionTextBox
            -
          • -
          • -

            AnalysisMethodPanel_DistanceFunctionsListBox

            -
            javax.swing.JList<E> AnalysisMethodPanel_DistanceFunctionsListBox
            -
          • -
          • -

            AnalysisMethodPanel_NotesButton

            -
            javax.swing.JButton AnalysisMethodPanel_NotesButton
            -
          • -
          • -

            AnalysisMethodPanel_RemoveAllAnalysisMethodsButton

            -
            javax.swing.JButton AnalysisMethodPanel_RemoveAllAnalysisMethodsButton
            -
          • -
          • -

            AnalysisMethodPanel_RemoveAnalysisMethodsButton

            -
            javax.swing.JButton AnalysisMethodPanel_RemoveAnalysisMethodsButton
            -
          • -
          • -

            AnalysisMethodPanel_SelectedAnalysisMethodsListBox

            -
            javax.swing.JList<E> AnalysisMethodPanel_SelectedAnalysisMethodsListBox
            -
          • -
          • -

            BatchLoadMenuItem

            -
            javax.swing.JMenuItem BatchLoadMenuItem
            -
          • -
          • -

            BatchSaveMenuItem

            -
            javax.swing.JMenuItem BatchSaveMenuItem
            -
          • -
          • -

            CanonicizersPanel_AddCanonicizerButton

            -
            javax.swing.JButton CanonicizersPanel_AddCanonicizerButton
            -
          • -
          • -

            CanonicizersPanel_CanonicizerListBox

            -
            javax.swing.JList<E> CanonicizersPanel_CanonicizerListBox
            -
          • -
          • -

            CanonicizersPanel_DocumentsCanonicizerDescriptionTextBox

            -
            javax.swing.JTextArea CanonicizersPanel_DocumentsCanonicizerDescriptionTextBox
            -
          • -
          • -

            CanonicizersPanel_NotesButton

            -
            javax.swing.JButton CanonicizersPanel_NotesButton
            -
          • -
          • -

            CanonicizersPanel_RemoveAllCanonicizersButton

            -
            javax.swing.JButton CanonicizersPanel_RemoveAllCanonicizersButton
            -
          • -
          • -

            CanonicizersPanel_RemoveCanonicizerButton

            -
            javax.swing.JButton CanonicizersPanel_RemoveCanonicizerButton
            -
          • -
          • -

            CanonicizersPanel_SelectedCanonicizerListBox

            -
            javax.swing.JList<E> CanonicizersPanel_SelectedCanonicizerListBox
            -
          • -
          • -

            DocumentsPanel_AddAuthorButton

            -
            javax.swing.JButton DocumentsPanel_AddAuthorButton
            -
          • -
          • -

            DocumentsPanel_AddDocumentsButton

            -
            javax.swing.JButton DocumentsPanel_AddDocumentsButton
            -
          • -
          • -

            DocumentsPanel_EditAuthorButton

            -
            javax.swing.JButton DocumentsPanel_EditAuthorButton
            -
          • -
          • -

            DocumentsPanel_KnownAuthorsTree

            -
            javax.swing.JTree DocumentsPanel_KnownAuthorsTree
            -
          • -
          • -

            DocumentsPanel_LanguageComboBox

            -
            javax.swing.JComboBox<E> DocumentsPanel_LanguageComboBox
            -
          • -
          • -

            CanonicizersPanel_DocTypeComboBox

            -
            javax.swing.JComboBox<E> CanonicizersPanel_DocTypeComboBox
            -
          • -
          • -

            DocumentsPanel_NotesButton

            -
            javax.swing.JButton DocumentsPanel_NotesButton
            -
          • -
          • -

            DocumentsPanel_RemoveAuthorButton

            -
            javax.swing.JButton DocumentsPanel_RemoveAuthorButton
            -
          • -
          • -

            DocumentsPanel_RemoveDocumentsButton

            -
            javax.swing.JButton DocumentsPanel_RemoveDocumentsButton
            -
          • -
          • -

            DocumentsPanel_UnknownAuthorsTable

            -
            javax.swing.JTable DocumentsPanel_UnknownAuthorsTable
            -
          • -
          • -

            EventCullingPanel_AddAllEventCullingButton

            -
            javax.swing.JButton EventCullingPanel_AddAllEventCullingButton
            -
          • -
          • -

            EventCullingPanel_AddEventCullingButton

            -
            javax.swing.JButton EventCullingPanel_AddEventCullingButton
            -
          • -
          • -

            EventCullingPanel_EventCullingDescriptionTextbox

            -
            javax.swing.JTextArea EventCullingPanel_EventCullingDescriptionTextbox
            -
          • -
          • -

            EventCullingPanel_EventCullingListBox

            -
            javax.swing.JList<E> EventCullingPanel_EventCullingListBox
            -
          • -
          • -

            EventCullingPanel_NotesButton

            -
            javax.swing.JButton EventCullingPanel_NotesButton
            -
          • -
          • -

            EventCullingPanel_ParametersPanel

            -
            javax.swing.JPanel EventCullingPanel_ParametersPanel
            -
          • -
          • -

            EventCullingPanel_RemoveAllEventCullingButton

            -
            javax.swing.JButton EventCullingPanel_RemoveAllEventCullingButton
            -
          • -
          • -

            EventCullingPanel_RemoveEventCullingButton

            -
            javax.swing.JButton EventCullingPanel_RemoveEventCullingButton
            -
          • -
          • -

            EventCullingPanel_SelectedEventCullingListBox

            -
            javax.swing.JList<E> EventCullingPanel_SelectedEventCullingListBox
            -
          • -
          • -

            EventSetsPanel_AddAllEventSetsButton

            -
            javax.swing.JButton EventSetsPanel_AddAllEventSetsButton
            -
          • -
          • -

            EventSetsPanel_AddEventSetButton

            -
            javax.swing.JButton EventSetsPanel_AddEventSetButton
            -
          • -
          • -

            EventSetsPanel_EventSetDescriptionTextBox

            -
            javax.swing.JTextArea EventSetsPanel_EventSetDescriptionTextBox
            -
          • -
          • -

            EventSetsPanel_EventSetListBox

            -
            javax.swing.JList<E> EventSetsPanel_EventSetListBox
            -
          • -
          • -

            EventSetsPanel_NotesButton

            -
            javax.swing.JButton EventSetsPanel_NotesButton
            -
          • -
          • -

            EventSetsPanel_ParametersPanel

            -
            javax.swing.JPanel EventSetsPanel_ParametersPanel
            -
          • -
          • -

            EventSetsPanel_RemoveAllEventSetsButton

            -
            javax.swing.JButton EventSetsPanel_RemoveAllEventSetsButton
            -
          • -
          • -

            EventSetsPanel_RemoveEventSetButton

            -
            javax.swing.JButton EventSetsPanel_RemoveEventSetButton
            -
          • -
          • -

            EventSetsPanel_SelectedEventSetListBox

            -
            javax.swing.JList<E> EventSetsPanel_SelectedEventSetListBox
            -
          • -
          • -

            JGAAP_AnalysisMethodPanel

            -
            javax.swing.JPanel JGAAP_AnalysisMethodPanel
            -
          • -
          • -

            JGAAP_CanonicizerPanel

            -
            javax.swing.JPanel JGAAP_CanonicizerPanel
            -
          • -
          • -

            JGAAP_DocumentsPanel

            -
            javax.swing.JPanel JGAAP_DocumentsPanel
            -
          • -
          • -

            JGAAP_EventCullingPanel

            -
            javax.swing.JPanel JGAAP_EventCullingPanel
            -
          • -
          • -

            JGAAP_EventSetsPanel

            -
            javax.swing.JPanel JGAAP_EventSetsPanel
            -
          • -
          • -

            JGAAP_MenuBar

            -
            javax.swing.JMenuBar JGAAP_MenuBar
            -
          • -
          • -

            JGAAP_ReviewPanel

            -
            javax.swing.JPanel JGAAP_ReviewPanel
            -
          • -
          • -

            JGAAP_TabbedPane

            -
            javax.swing.JTabbedPane JGAAP_TabbedPane
            -
          • -
          • -

            Next_Button

            -
            javax.swing.JButton Next_Button
            -
          • -
          • -

            ProblemAMenuItem

            -
            javax.swing.JMenuItem ProblemAMenuItem
            -
          • -
          • -

            ProblemBMenuItem

            -
            javax.swing.JMenuItem ProblemBMenuItem
            -
          • -
          • -

            ProblemCMenuItem

            -
            javax.swing.JMenuItem ProblemCMenuItem
            -
          • -
          • -

            ProblemDMenuItem

            -
            javax.swing.JMenuItem ProblemDMenuItem
            -
          • -
          • -

            ProblemEMenuItem

            -
            javax.swing.JMenuItem ProblemEMenuItem
            -
          • -
          • -

            ProblemFMenuItem

            -
            javax.swing.JMenuItem ProblemFMenuItem
            -
          • -
          • -

            ProblemGMenuItem

            -
            javax.swing.JMenuItem ProblemGMenuItem
            -
          • -
          • -

            ProblemHMenuItem

            -
            javax.swing.JMenuItem ProblemHMenuItem
            -
          • -
          • -

            ProblemIMenuItem

            -
            javax.swing.JMenuItem ProblemIMenuItem
            -
          • -
          • -

            ProblemJMenuItem

            -
            javax.swing.JMenuItem ProblemJMenuItem
            -
          • -
          • -

            ProblemKMenuItem

            -
            javax.swing.JMenuItem ProblemKMenuItem
            -
          • -
          • -

            ProblemLMenuItem

            -
            javax.swing.JMenuItem ProblemLMenuItem
            -
          • -
          • -

            ProblemMMenuItem

            -
            javax.swing.JMenuItem ProblemMMenuItem
            -
          • -
          • -

            ReviewPanel_DocumentsLabel

            -
            javax.swing.JLabel ReviewPanel_DocumentsLabel
            -
          • -
          • -

            ReviewPanel_ProcessButton

            -
            javax.swing.JButton ReviewPanel_ProcessButton
            -
          • -
          • -

            ReviewPanel_SelectedAnalysisMethodsLabel

            -
            javax.swing.JLabel ReviewPanel_SelectedAnalysisMethodsLabel
            -
          • -
          • -

            ReviewPanel_SelectedAnalysisMethodsListBox

            -
            javax.swing.JList<E> ReviewPanel_SelectedAnalysisMethodsListBox
            -
          • -
          • -

            ReviewPanel_SelectedEventCullingLabel

            -
            javax.swing.JLabel ReviewPanel_SelectedEventCullingLabel
            -
          • -
          • -

            ReviewPanel_SelectedEventCullingListBox

            -
            javax.swing.JList<E> ReviewPanel_SelectedEventCullingListBox
            -
          • -
          • -

            ReviewPanel_SelectedEventSetLabel

            -
            javax.swing.JLabel ReviewPanel_SelectedEventSetLabel
            -
          • -
          • -

            ReviewPanel_SelectedEventSetListBox

            -
            javax.swing.JList<E> ReviewPanel_SelectedEventSetListBox
            -
          • -
          • -

            ReviewPanel_CanonicizersListBox

            -
            javax.swing.JList<E> ReviewPanel_CanonicizersListBox
            -
          • -
          • -

            Review_Button

            -
            javax.swing.JButton Review_Button
            -
          • -
          • -

            aboutMenuItem

            -
            javax.swing.JMenuItem aboutMenuItem
            -
          • -
          • -

            exitMenuItem

            -
            javax.swing.JMenuItem exitMenuItem
            -
          • -
          • -

            helpCloseButton

            -
            javax.swing.JButton helpCloseButton
            -
          • -
          • -

            helpDialog

            -
            javax.swing.JDialog helpDialog
            -
          • -
          • -

            helpMenu

            -
            javax.swing.JMenu helpMenu
            -
          • -
          • -

            jLabel1

            -
            javax.swing.JLabel jLabel1
            -
          • -
          • -

            jLabel10

            -
            javax.swing.JLabel jLabel10
            -
          • -
          • -

            jLabel11

            -
            javax.swing.JLabel jLabel11
            -
          • -
          • -

            jLabel12

            -
            javax.swing.JLabel jLabel12
            -
          • -
          • -

            jLabel13

            -
            javax.swing.JLabel jLabel13
            -
          • -
          • -

            jLabel15

            -
            javax.swing.JLabel jLabel15
            -
          • -
          • -

            jLabel16

            -
            javax.swing.JLabel jLabel16
            -
          • -
          • -

            jLabel17

            -
            javax.swing.JLabel jLabel17
            -
          • -
          • -

            jLabel18

            -
            javax.swing.JLabel jLabel18
            -
          • -
          • -

            jLabel2

            -
            javax.swing.JLabel jLabel2
            -
          • -
          • -

            jLabel20

            -
            javax.swing.JLabel jLabel20
            -
          • -
          • -

            jLabel21

            -
            javax.swing.JLabel jLabel21
            -
          • -
          • -

            jLabel22

            -
            javax.swing.JLabel jLabel22
            -
          • -
          • -

            jLabel23

            -
            javax.swing.JLabel jLabel23
            -
          • -
          • -

            jLabel24

            -
            javax.swing.JLabel jLabel24
            -
          • -
          • -

            jLabel25

            -
            javax.swing.JLabel jLabel25
            -
          • -
          • -

            jLabel26

            -
            javax.swing.JLabel jLabel26
            -
          • -
          • -

            jLabel28

            -
            javax.swing.JLabel jLabel28
            -
          • -
          • -

            jLabel29

            -
            javax.swing.JLabel jLabel29
            -
          • -
          • -

            jLabel30

            -
            javax.swing.JLabel jLabel30
            -
          • -
          • -

            jLabel32

            -
            javax.swing.JLabel jLabel32
            -
          • -
          • -

            jLabel35

            -
            javax.swing.JLabel jLabel35
            -
          • -
          • -

            jLabel36

            -
            javax.swing.JLabel jLabel36
            -
          • -
          • -

            jLabel37

            -
            javax.swing.JLabel jLabel37
            -
          • -
          • -

            jLabel6

            -
            javax.swing.JLabel jLabel6
            -
          • -
          • -

            jLabel7

            -
            javax.swing.JLabel jLabel7
            -
          • -
          • -

            jLabel8

            -
            javax.swing.JLabel jLabel8
            -
          • -
          • -

            jLabel9

            -
            javax.swing.JLabel jLabel9
            -
          • -
          • -

            jMenu1

            -
            javax.swing.JMenu jMenu1
            -
          • -
          • -

            jMenu2

            -
            javax.swing.JMenu jMenu2
            -
          • -
          • -

            jMenu4

            -
            javax.swing.JMenu jMenu4
            -
          • -
          • -

            jScrollPane1

            -
            javax.swing.JScrollPane jScrollPane1
            -
          • -
          • -

            jScrollPane10

            -
            javax.swing.JScrollPane jScrollPane10
            -
          • -
          • -

            jScrollPane11

            -
            javax.swing.JScrollPane jScrollPane11
            -
          • -
          • -

            jScrollPane12

            -
            javax.swing.JScrollPane jScrollPane12
            -
          • -
          • -

            jScrollPane13

            -
            javax.swing.JScrollPane jScrollPane13
            -
          • -
          • -

            jScrollPane14

            -
            javax.swing.JScrollPane jScrollPane14
            -
          • -
          • -

            jScrollPane15

            -
            javax.swing.JScrollPane jScrollPane15
            -
          • -
          • -

            jScrollPane16

            -
            javax.swing.JScrollPane jScrollPane16
            -
          • -
          • -

            jScrollPane17

            -
            javax.swing.JScrollPane jScrollPane17
            -
          • -
          • -

            jScrollPane18

            -
            javax.swing.JScrollPane jScrollPane18
            -
          • -
          • -

            jScrollPane19

            -
            javax.swing.JScrollPane jScrollPane19
            -
          • -
          • -

            jScrollPane2

            -
            javax.swing.JScrollPane jScrollPane2
            -
          • -
          • -

            jScrollPane22

            -
            javax.swing.JScrollPane jScrollPane22
            -
          • -
          • -

            jScrollPane23

            -
            javax.swing.JScrollPane jScrollPane23
            -
          • -
          • -

            jScrollPane24

            -
            javax.swing.JScrollPane jScrollPane24
            -
          • -
          • -

            jScrollPane25

            -
            javax.swing.JScrollPane jScrollPane25
            -
          • -
          • -

            jScrollPane26

            -
            javax.swing.JScrollPane jScrollPane26
            -
          • -
          • -

            jScrollPane27

            -
            javax.swing.JScrollPane jScrollPane27
            -
          • -
          • -

            jScrollPane6

            -
            javax.swing.JScrollPane jScrollPane6
            -
          • -
          • -

            jScrollPane9

            -
            javax.swing.JScrollPane jScrollPane9
            -
          • -
          -
        • -
        -
      • -
      • - - -

        Class com.jgaap.ui.JGAAP_UI_NotesDialog extends javax.swing.JDialog implements Serializable

        -
        -
        serialVersionUID:
        -
        1L
        -
        -
          -
        • - - -

          Serialized Fields

          -
            -
          • -

            SavedNote

            -
            java.lang.String SavedNote
            -
          • -
          • -

            Cancel_Button

            -
            javax.swing.JButton Cancel_Button
            -
          • -
          • -

            Notes_TextArea

            -
            javax.swing.JTextArea Notes_TextArea
            -
          • -
          • -

            OK_Button

            -
            javax.swing.JButton OK_Button
            -
          • -
          • -

            jScrollPane1

            -
            javax.swing.JScrollPane jScrollPane1
            -
          • -
          -
        • -
        -
      • -
      • - - -

        Class com.jgaap.ui.JGAAP_UI_ResultsDialog extends javax.swing.JDialog implements Serializable

        -
        -
        serialVersionUID:
        -
        1L
        -
        -
          -
        • - - -

          Serialized Fields

          -
            -
          • -

            ClearTabs_Button

            -
            javax.swing.JButton ClearTabs_Button
            -
          • -
          • -

            Results_TabbedPane

            -
            javax.swing.JTabbedPane Results_TabbedPane
            -
          • -
          -
        • -
        -
      • -
      -
    • -
    -
    - -
    - - - - - -
    - - - - diff --git a/docs/javadoc/stylesheet.css b/docs/javadoc/stylesheet.css deleted file mode 100644 index 0aeaa97fe..000000000 --- a/docs/javadoc/stylesheet.css +++ /dev/null @@ -1,474 +0,0 @@ -/* Javadoc style sheet */ -/* -Overall document style -*/ -body { - background-color:#ffffff; - color:#353833; - font-family:Arial, Helvetica, sans-serif; - font-size:76%; - margin:0; -} -a:link, a:visited { - text-decoration:none; - color:#4c6b87; -} -a:hover, a:focus { - text-decoration:none; - color:#bb7a2a; -} -a:active { - text-decoration:none; - color:#4c6b87; -} -a[name] { - color:#353833; -} -a[name]:hover { - text-decoration:none; - color:#353833; -} -pre { - font-size:1.3em; -} -h1 { - font-size:1.8em; -} -h2 { - font-size:1.5em; -} -h3 { - font-size:1.4em; -} -h4 { - font-size:1.3em; -} -h5 { - font-size:1.2em; -} -h6 { - font-size:1.1em; -} -ul { - list-style-type:disc; -} -code, tt { - font-size:1.2em; -} -dt code { - font-size:1.2em; -} -table tr td dt code { - font-size:1.2em; - vertical-align:top; -} -sup { - font-size:.6em; -} -/* -Document title and Copyright styles -*/ -.clear { - clear:both; - height:0px; - overflow:hidden; -} -.aboutLanguage { - float:right; - padding:0px 21px; - font-size:.8em; - z-index:200; - margin-top:-7px; -} -.legalCopy { - margin-left:.5em; -} -.bar a, .bar a:link, .bar a:visited, .bar a:active { - color:#FFFFFF; - text-decoration:none; -} -.bar a:hover, .bar a:focus { - color:#bb7a2a; -} -.tab { - background-color:#0066FF; - background-image:url(resources/titlebar.gif); - background-position:left top; - background-repeat:no-repeat; - color:#ffffff; - padding:8px; - width:5em; - font-weight:bold; -} -/* -Navigation bar styles -*/ -.bar { - background-image:url(resources/background.gif); - background-repeat:repeat-x; - color:#FFFFFF; - padding:.8em .5em .4em .8em; - height:auto;/*height:1.8em;*/ - font-size:1em; - margin:0; -} -.topNav { - background-image:url(resources/background.gif); - background-repeat:repeat-x; - color:#FFFFFF; - float:left; - padding:0; - width:100%; - clear:right; - height:2.8em; - padding-top:10px; - overflow:hidden; -} -.bottomNav { - margin-top:10px; - background-image:url(resources/background.gif); - background-repeat:repeat-x; - color:#FFFFFF; - float:left; - padding:0; - width:100%; - clear:right; - height:2.8em; - padding-top:10px; - overflow:hidden; -} -.subNav { - background-color:#dee3e9; - border-bottom:1px solid #9eadc0; - float:left; - width:100%; - overflow:hidden; -} -.subNav div { - clear:left; - float:left; - padding:0 0 5px 6px; -} -ul.navList, ul.subNavList { - float:left; - margin:0 25px 0 0; - padding:0; -} -ul.navList li{ - list-style:none; - float:left; - padding:3px 6px; -} -ul.subNavList li{ - list-style:none; - float:left; - font-size:90%; -} -.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { - color:#FFFFFF; - text-decoration:none; -} -.topNav a:hover, .bottomNav a:hover { - text-decoration:none; - color:#bb7a2a; -} -.navBarCell1Rev { - background-image:url(resources/tab.gif); - background-color:#a88834; - color:#FFFFFF; - margin: auto 5px; - border:1px solid #c9aa44; -} -/* -Page header and footer styles -*/ -.header, .footer { - clear:both; - margin:0 20px; - padding:5px 0 0 0; -} -.indexHeader { - margin:10px; - position:relative; -} -.indexHeader h1 { - font-size:1.3em; -} -.title { - color:#2c4557; - margin:10px 0; -} -.subTitle { - margin:5px 0 0 0; -} -.header ul { - margin:0 0 25px 0; - padding:0; -} -.footer ul { - margin:20px 0 5px 0; -} -.header ul li, .footer ul li { - list-style:none; - font-size:1.2em; -} -/* -Heading styles -*/ -div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { - background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; - margin:0 0 6px -8px; - padding:2px 5px; -} -ul.blockList ul.blockList ul.blockList li.blockList h3 { - background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; - margin:0 0 6px -8px; - padding:2px 5px; -} -ul.blockList ul.blockList li.blockList h3 { - padding:0; - margin:15px 0; -} -ul.blockList li.blockList h2 { - padding:0px 0 20px 0; -} -/* -Page layout container styles -*/ -.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { - clear:both; - padding:10px 20px; - position:relative; -} -.indexContainer { - margin:10px; - position:relative; - font-size:1.0em; -} -.indexContainer h2 { - font-size:1.1em; - padding:0 0 3px 0; -} -.indexContainer ul { - margin:0; - padding:0; -} -.indexContainer ul li { - list-style:none; -} -.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { - font-size:1.1em; - font-weight:bold; - margin:10px 0 0 0; - color:#4E4E4E; -} -.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { - margin:10px 0 10px 20px; -} -.serializedFormContainer dl.nameValue dt { - margin-left:1px; - font-size:1.1em; - display:inline; - font-weight:bold; -} -.serializedFormContainer dl.nameValue dd { - margin:0 0 0 1px; - font-size:1.1em; - display:inline; -} -/* -List styles -*/ -ul.horizontal li { - display:inline; - font-size:0.9em; -} -ul.inheritance { - margin:0; - padding:0; -} -ul.inheritance li { - display:inline; - list-style:none; -} -ul.inheritance li ul.inheritance { - margin-left:15px; - padding-left:15px; - padding-top:1px; -} -ul.blockList, ul.blockListLast { - margin:10px 0 10px 0; - padding:0; -} -ul.blockList li.blockList, ul.blockListLast li.blockList { - list-style:none; - margin-bottom:25px; -} -ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { - padding:0px 20px 5px 10px; - border:1px solid #9eadc0; - background-color:#f9f9f9; -} -ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { - padding:0 0 5px 8px; - background-color:#ffffff; - border:1px solid #9eadc0; - border-top:none; -} -ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { - margin-left:0; - padding-left:0; - padding-bottom:15px; - border:none; - border-bottom:1px solid #9eadc0; -} -ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { - list-style:none; - border-bottom:none; - padding-bottom:0; -} -table tr td dl, table tr td dl dt, table tr td dl dd { - margin-top:0; - margin-bottom:1px; -} -/* -Table styles -*/ -.contentContainer table, .classUseContainer table, .constantValuesContainer table { - border-bottom:1px solid #9eadc0; - width:100%; -} -.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { - width:100%; -} -.contentContainer .description table, .contentContainer .details table { - border-bottom:none; -} -.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ - vertical-align:top; - padding-right:20px; -} -.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, -.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, -.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, -.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { - padding-right:3px; -} -.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { - position:relative; - text-align:left; - background-repeat:no-repeat; - color:#FFFFFF; - font-weight:bold; - clear:none; - overflow:hidden; - padding:0px; - margin:0px; -} -caption a:link, caption a:hover, caption a:active, caption a:visited { - color:#FFFFFF; -} -.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { - white-space:nowrap; - padding-top:8px; - padding-left:8px; - display:block; - float:left; - background-image:url(resources/titlebar.gif); - height:18px; -} -.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { - width:10px; - background-image:url(resources/titlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; - position:relative; - float:left; -} -ul.blockList ul.blockList li.blockList table { - margin:0 0 12px 0px; - width:100%; -} -.tableSubHeadingColor { - background-color: #EEEEFF; -} -.altColor { - background-color:#eeeeef; -} -.rowColor { - background-color:#ffffff; -} -.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { - text-align:left; - padding:3px 3px 3px 7px; -} -th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { - background:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; - text-align:left; - padding:3px 3px 3px 7px; -} -td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { - font-weight:bold; -} -td.colFirst, th.colFirst { - border-left:1px solid #9eadc0; - white-space:nowrap; -} -td.colLast, th.colLast { - border-right:1px solid #9eadc0; -} -td.colOne, th.colOne { - border-right:1px solid #9eadc0; - border-left:1px solid #9eadc0; -} -table.overviewSummary { - padding:0px; - margin-left:0px; -} -table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, -table.overviewSummary td.colOne, table.overviewSummary th.colOne { - width:25%; - vertical-align:middle; -} -table.packageSummary td.colFirst, table.overviewSummary th.colFirst { - width:25%; - vertical-align:middle; -} -/* -Content styles -*/ -.description pre { - margin-top:0; -} -.deprecatedContent { - margin:0; - padding:10px 0; -} -.docSummary { - padding:0; -} -/* -Formatting effect styles -*/ -.sourceLineNo { - color:green; - padding:0 30px 0 0; -} -h1.hidden { - visibility:hidden; - overflow:hidden; - font-size:.9em; -} -.block { - display:block; - margin:3px 0 0 0; -} -.strong { - font-weight:bold; -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..d7672dc6e --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,10 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +guava = "33.0.0-jre" +junit-jupiter = "5.10.2" + +[libraries] +guava = { module = "com.google.guava:guava", version.ref = "guava" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e6441136f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..a4413138c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..b740cf133 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..7101f8e46 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jgaap/.classpath b/jgaap/.classpath new file mode 100644 index 000000000..a06ab7e07 --- /dev/null +++ b/jgaap/.classpath @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jgaap/.project b/jgaap/.project new file mode 100644 index 000000000..0a0c4cc33 --- /dev/null +++ b/jgaap/.project @@ -0,0 +1,41 @@ + + + jgaap + + + + + + java.bs.JavaProblemChecker + + + + + com.microsoft.gradle.bs.importer.builder.BuildServerBuilder + full,incremental, + + + + + + org.eclipse.jdt.core.javanature + com.microsoft.gradle.bs.importer.GradleBuildServerProjectNature + + + + 1719866669648 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + + + bspSchemaVersion + 0.1.0 + + + diff --git a/jgaap/.settings/org.eclipse.jdt.core.prefs b/jgaap/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..f0cd5de39 --- /dev/null +++ b/jgaap/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.source=21 diff --git a/jgaap/build.gradle b/jgaap/build.gradle new file mode 100644 index 000000000..8809f144a --- /dev/null +++ b/jgaap/build.gradle @@ -0,0 +1,134 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.8/userguide/building_java_projects.html in the Gradle documentation. + */ + +plugins { + // Apply the application plugin to add support for building a CLI application in Java. + id 'application' + id 'org.openjfx.javafxplugin' version '0.1.0' + id 'org.beryx.runtime' version '1.13.1' +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + implementation files('src/main/resources/lib/commons-cli-1.2.jar') + implementation files('src/main/resources/lib/edu.mit.jwi_2.2.3.jar') + implementation files('src/main/resources/lib/guava-17.0.jar') + implementation files('src/main/resources/lib/javassist-3.17.1.jar') + implementation files('src/main/resources/lib/jscience-4.3.1.jar') + implementation files('src/main/resources/lib/junit.jar') + implementation files('src/main/resources/lib/log4j-api-2.23.1.jar') + implementation files('src/main/resources/lib/log4j-core-2.23.1.jar') + implementation files('src/main/resources/lib/log4j-iostreams-2.23.1.jar') + implementation files('src/main/resources/lib/reflections-0.9.8.jar') + implementation files('src/main/resources/lib/stanford-ner-2012-07-09.jar') + implementation files('src/main/resources/lib/stanford-postagger-2012-07-09.jar') + implementation files('src/main/resources/lib/tika-app-1.5.jar') + implementation files('src/main/resources/lib/weka.jar') + implementation files('src/main/resources/lib/WordSegment.jar') +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +compileJava { + options.release = 21 + options.fork = true +} + + +sourceSets { + main { + output.resourcesDir = "build/classes/java/main/com/jgaap/resources" + } + test { + output.resourcesDir = "build/classes/java/main/com/jgaap/resources" + } +} + +javafx { + version = '21.0.3' + modules = [ 'javafx.controls', 'javafx.graphics' ] +} + +application { + applicationName = 'JGAAP' + applicationDefaultJvmArgs = ['-XX:+UseG1GC', '-Xmx4096m'] + mainClass = 'com.jgaap.JGAAP' +} + +jar { + //from("build/classes/java/main/com/jgaap/") + manifest { + attributes( + "Application-Name": "JGAAP", + "Main-Class": 'com.jgaap.JGAAP', + "Class-Path": '.' + ) + } +} + +//https://github.com/beryx/badass-runtime-plugin/ +runtime { + + options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages'] + modules = [ 'javafx.controls', 'javafx.graphics' ] + launcher { + jvmArgs = [ + '-XX:+UseG1GC', '-Xmx4096m' + ] + runInBinDir = true + noConsole = true + } + +// Uncomment and adjust the code below if you want to generate images for multiple platforms. +// (You need to also uncomment the line 'targetPlatformName = ...' in the jpackage block.) + + jpackage { + // Uncomment and adjust the following line if your runtime task is configured to generate images for multiple platforms + // targetPlatformName = "mac" + + def currentOs = org.gradle.internal.os.OperatingSystem.current() + def arch = System.getProperty("os.arch") + def imgType = currentOs.windows ? 'ico' : currentOs.macOsX ? 'icns' : 'png' + resourceDir = file("$buildDir/classes/java/main/com/jgaap/resources") + imageOptions += ['--icon', "src/main/resources/ui/icon.$imgType"] + installerOptions += ['--resource-dir', "src/main/resources"] + installerOptions += ['--vendor', 'EVLLabs'] + + if(currentOs.windows) { + installerName = "JGAAP" + appVersion = '9.0.0' + installerType = 'msi' + imageOptions += ["--win-console"] + installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut'] + } + else if (currentOs.linux) { + installerName = "JGAAP-" + arch + appVersion = '9.0.0' + installerType = 'deb' + installerOptions += ['--linux-package-name', 'JGAAP', '--linux-shortcut'] + } + else if (currentOs.macOsX) { + installerName = "JGAAP-" + arch + appVersion = '9.0.0' + installerOptions += ['--mac-package-name', 'JGAAP'] + installerType = 'dmg' + + } + } +} +tasks.named('test') { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_AddAuthor.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_AddAuthor.java new file mode 100644 index 000000000..b9edef27e --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_AddAuthor.java @@ -0,0 +1,254 @@ +package com.jgaap.GUI; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.log4j.Logger; + +import com.jgaap.backend.API; +import com.jgaap.util.Document; + +import javafx.collections.FXCollections; +import javafx.geometry.Insets; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TableView.TableViewSelectionModel; +import javafx.scene.control.TextField; +import javafx.scene.control.Tooltip; +import javafx.scene.control.cell.PropertyValueFactory; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.FileChooser; +import javafx.stage.Stage; + +/** + * GUI_AddAuthor class is for building a Window to add an Author to the program. + * + * @author Edward Polens + */ +public class GUI_AddAuthor { + + private static TableView table; + private static ArrayList docs; + private static Logger logger; + private static API JAPI; + private static TextField auth; + private static String selAuth; + private Stage stage; + + /** + * Initial constructor for the class. + */ + public GUI_AddAuthor() { + logger = Logger.getLogger(GUI_AddAuthor.class); + logger.info("Author Adding constructor called."); + docs = new ArrayList(); + this.stage = new Stage(); + JAPI = API.getInstance(); + selAuth = ""; + stage.setTitle("Add Author"); + stage.setScene(init_scene()); + logger.info("Finished building Adding Author Window."); + + } + /** + * Constructor for the class to edit an author. + * + * @param author String + */ + public GUI_AddAuthor(String author) { + logger = Logger.getLogger(GUI_AddAuthor.class); + logger.info("Author Editing constructor called."); + docs = new ArrayList(); + this.stage = new Stage(); + JAPI = API.getInstance(); + stage.setTitle("Add Author"); + selAuth = author; + stage.setScene(init_scene()); + logger.info("Finished building Edit Author Window."); + } + /** + * Method to build the Scene for the Stage. + * + * @return Scene + */ + private Scene init_scene() { + logger.info("Building Author Window."); + VBox box = new VBox(); + box.getChildren().addAll(init_authorBox(), init_authorTable(), init_bottomButtons()); + box.setPadding(new Insets(5)); + Scene scene = new Scene(box,500,300); + return scene; + + } + /** + * Method to initialize the Author name text box. + * + * @return HBox + */ + private HBox init_authorBox() { + HBox box = new HBox(5); + Label authl = new Label("Author"); + auth = new TextField(); + auth.setOnAction(e -> { + updateItemView(); + e.consume(); + }); + box.getChildren().addAll(authl, auth); + return box; + } + /** + * Method to initialize the Documents to be added to the Author. + * + * @return VBox + */ + private VBox init_authorTable() { + VBox box = new VBox(5); + HBox butBox = new HBox(5); + Button add = new Button("Add Document"); + Button rem = new Button("Remove Document"); + table = new TableView(); + TableColumn column1 = new TableColumn("Title"); + TableColumn column2 = new TableColumn("File Path"); + column1.setCellValueFactory(new PropertyValueFactory("Title")); + column2.setCellValueFactory(new PropertyValueFactory("FilePath")); + column1.prefWidthProperty().bind(table.widthProperty().divide(2)); + column2.prefWidthProperty().bind(table.widthProperty().divide(2)); + table.getColumns().add(column1); + table.getColumns().add(column2); + table.prefHeightProperty().bind(this.stage.heightProperty()); + table.prefWidthProperty().bind(this.stage.widthProperty()); + if(selAuth.isEmpty()){ + table.setItems(FXCollections.observableArrayList(JAPI.getDocumentsByAuthor(auth.getText().trim()))); + } else { + for(Document i: JAPI.getDocumentsByAuthor(selAuth)){ + docs.add(i); + } + auth.setText(selAuth); + table.setItems(FXCollections.observableArrayList(docs)); + } + // =============================================================================== + add.setOnAction(e -> { + FileChooser FileChoser = new FileChooser(); + List choice = FileChoser.showOpenMultipleDialog(this.stage); + for (File file : choice) { + try { + String filepath = file.getCanonicalPath(); + String[] Split = filepath.split("[\\\\[\\/]]"); + String Title = Split[Split.length - 1]; + Document temp = new Document(filepath, auth.getText().trim(), Title); + docs.add(temp); + table.setItems(FXCollections.observableArrayList(docs)); + table.refresh(); + } catch (Exception ex) { + logger.error(ex.getCause(), ex); + ex.printStackTrace(); + } + } + e.consume(); + }); + // =============================================================================== + // =============================================================================== + rem.setOnAction(e -> { + TableViewSelectionModel selected = table.getSelectionModel(); + List docs = new ArrayList(); + docs.addAll(selected.getSelectedItems()); + for (Document doc : docs) { + docs.remove(doc); + } + table.setItems(FXCollections.observableArrayList(docs)); + table.refresh(); + e.consume(); + }); + // =============================================================================== + butBox.getChildren().addAll(add, rem); + box.getChildren().addAll(table, butBox); + return box; + + } + /** + * Build the bottom buttons on the Panel. + * + * @return HBox + */ + private HBox init_bottomButtons() { + HBox box = new HBox(5); + Button ok = new Button("OK"); + Button can = new Button("Cancel"); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + ok.setTooltip(new Tooltip("Confirm changes.")); + can.setTooltip(new Tooltip("Remove all changes.")); + // =============================================================================== + ok.setOnAction(e -> { + if (!docs.isEmpty()) { + if(selAuth.isEmpty()){ + addDoc(docs); + } else if(!selAuth.equalsIgnoreCase(auth.getText())) { + updateAuthor(docs); + } + } + GUI_DocTab.updateAuthorTree(); + stage.close(); + e.consume(); + }); + // =============================================================================== + // =============================================================================== + can.setOnAction(e -> { + auth.setText(""); + selAuth = ""; + docs.clear(); + stage.close(); + e.consume(); + }); + // =============================================================================== + box.getChildren().addAll(region1,ok, can); + + return box; + } + /** + * Update the Document List View box. + */ + private void updateItemView() { + table.setItems(FXCollections.observableArrayList(JAPI.getDocumentsByAuthor(auth.getText().trim()))); + table.refresh(); + } + /** + * Add a document. + * + * @param doc ArrayList + */ + private void addDoc(ArrayList doc){ + for(Document i : doc){ + JAPI.addDocument(i); + } + } + /** + * Updates the author tree. + * + * @param doc ArrayList + */ + private void updateAuthor(ArrayList doc){ + String temp = auth.getText().trim(); + for(Document i : doc){ + JAPI.removeDocument(i); + i.setAuthor(temp); + JAPI.addDocument(i); + } + } + /** + * Get the constructed stage (Window). + * + * @return Stage + */ + public Stage getStage() { + return this.stage; + } + +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_AnalysisTab.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_AnalysisTab.java new file mode 100644 index 000000000..c0238edd5 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_AnalysisTab.java @@ -0,0 +1,494 @@ +package com.jgaap.GUI; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.geometry.Pos; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ListCell; +import javafx.scene.control.ListView; +import javafx.scene.control.TextArea; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; +import com.jgaap.generics.AnalysisDriver; +import com.jgaap.backend.AnalysisDrivers; +import com.jgaap.backend.DistanceFunctions; +import com.jgaap.generics.DistanceFunction; +import com.jgaap.generics.NeighborAnalysisDriver; +import com.jgaap.generics.NonDistanceDependentAnalysisDriver; +import java.util.ArrayList; + +import org.apache.log4j.Logger; + +import com.jgaap.backend.API; + +/** + * Analysis Tab Class. + * This Class creates the scene for the Analysis Tab and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_AnalysisTab { + + private static ArrayList AnalysisDriverMasterList; + private static ArrayList DistanceFunctionsMasterList; + private static TextArea anArea; + private static TextArea dfArea; + private static API JAPI; + private static Logger logger; + private static HBox bottomButtons; + private static ListView anList; + private static ListView dfList; + private static ListView selList; + private static GUI_NotesWindow notesBox; + private static ObservableList selItems; + private VBox box, param, paraBoxChildOne; + + /** + * Constructor for the class. + */ + public GUI_AnalysisTab() { + logger = Logger.getLogger(GUI_AnalysisTab.class); + JAPI = API.getInstance(); + notesBox = new GUI_NotesWindow(); + this.box = new VBox(); + init_analysisDrivers(); + init_distanceFunctions(); + } + + /** + * Builds the Pane row by row. + */ + private void build_pane() { + logger.info("Building Analysis Tab"); + this.box.getChildren().add(init_rowOne()); + this.box.getChildren().add(init_rowTwo()); + this.box.getChildren().add(bottomButtons); + } + + /** + * Creates the 'Top Row' of GUI elements in the window. + * + * @return HBox + */ + private HBox init_rowOne() { + HBox box = new HBox(5); + HBox noteBox = new HBox(); + VBox meth = new VBox(); + VBox sel = new VBox(); + this.param = new VBox(); + this.paraBoxChildOne = new VBox(); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + Button notes = notesBox.getButton(); + Label an = new Label("Analysis Method"); + Label df = new Label("Distance Function"); + Label se = new Label("Selected"); + Label am = new Label("Parameters"); + + an.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + df.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + se.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + am.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + paraBoxChildOne.setStyle("-fx-border-color: black"); + + paraBoxChildOne.prefHeightProperty().bind(this.box.heightProperty()); + paraBoxChildOne.prefWidthProperty().bind(this.box.widthProperty()); + + noteBox.getChildren().addAll(am, region1, notes); + meth.getChildren().addAll(an, init_AnalysisMethodBox(), df, init_DistanceFunctionBox()); + sel.getChildren().addAll(se, init_SelectedBox()); + param.getChildren().addAll(noteBox, paraBoxChildOne); + + box.getChildren().addAll(meth, init_rowOneButtons(), sel, param); + + return box; + } + + /** + * Creates the 'Second Row' of GUI elements in the window. + * + * @return HBox + */ + private HBox init_rowTwo() { + Label an = new Label("Analysis Method Description"); + Label df = new Label("Distance Function Description"); + anArea = new TextArea(); + dfArea = new TextArea(); + HBox box = new HBox(5); + VBox amd = new VBox(); + VBox dfd = new VBox(); + + anArea.prefHeightProperty().bind(this.box.heightProperty()); + anArea.prefWidthProperty().bind(this.box.widthProperty()); + dfArea.prefHeightProperty().bind(this.box.heightProperty()); + dfArea.prefWidthProperty().bind(this.box.widthProperty()); + anArea.setMinSize(100, 100); + dfArea.setMinSize(100, 100); + anArea.setWrapText(true); + dfArea.setWrapText(true); + anArea.setEditable(false); + dfArea.setEditable(false); + + an.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + df.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + amd.getChildren().addAll(an, anArea); + dfd.getChildren().addAll(df, dfArea); + + box.getChildren().addAll(amd, dfd); + + return box; + } + + /** + * Method for generating the selected list view bow. + * + * @return ListView + */ + private ListView init_SelectedBox() { + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + + selList.setItems(selItems); + selList.prefHeightProperty().bind(this.box.heightProperty()); + selList.prefWidthProperty().bind(this.box.widthProperty()); + selList.setCellFactory(param -> new ListCell() { + @Override + protected void updateItem(AnalysisDriver item, boolean empty) { + super.updateItem(item, empty); + if (empty || item == null || item.displayName().equalsIgnoreCase("")) { + setText(""); + } else { + setText(item.displayName()); + } + } + }); + selList.setOnMouseClicked(e -> { + AnalysisDriver sel = selList.getSelectionModel().getSelectedItem(); + VBox para = sel.getNewGUILayout(); + + logger.info("Changing Analysis Tab Parameter Boxes"); + para.prefHeightProperty().bind(this.box.heightProperty()); + para.prefWidthProperty().bind(this.box.widthProperty()); + this.param.getChildren().removeLast(); + this.param.getChildren().add(para); + + e.consume(); + }); + + return selList; + } + + /** + * Method for generating the analysis method selection box. + * + * @return ListView + */ + private ListView init_AnalysisMethodBox() { + selList = new ListView(); + anList = new ListView(); + + ObservableList anItems = FXCollections.observableArrayList(AnalysisDriverMasterList); + + anList.setItems(anItems); + anList.setCellFactory(param -> new ListCell() { + @Override + protected void updateItem(AnalysisDriver item, boolean empty) { + super.updateItem(item, empty); + if (empty || item == null || item.displayName().equalsIgnoreCase("")) { + setText(""); + } else { + setText(item.displayName()); + } + } + }); + anList.prefHeightProperty().bind(this.box.heightProperty()); + anList.prefWidthProperty().bind(this.box.widthProperty()); + anList.setOnMouseClicked(e -> { + dfList.getSelectionModel().clearSelection(); + AnalysisDriver sel = anList.getSelectionModel().getSelectedItem(); + if (!(sel instanceof NeighborAnalysisDriver)) { + dfList.setDisable(true); + } else { + dfList.setDisable(false); + } + anArea.setText(sel.longDescription()); + e.consume(); + }); + + return anList; + } + + /** + * Method for generating the distance function selection box. + * + * @return ListView + */ + private ListView init_DistanceFunctionBox() { + dfList = new ListView(); + + ObservableList dfItems = FXCollections.observableArrayList(DistanceFunctionsMasterList); + + dfList.setItems(dfItems); + dfList.setCellFactory(param -> new ListCell() { + @Override + protected void updateItem(DistanceFunction item, boolean empty) { + super.updateItem(item, empty); + if (empty || item == null || item.displayName().equalsIgnoreCase("")) { + setText(""); + } else { + setText(item.displayName()); + } + } + }); + dfList.prefHeightProperty().bind(this.box.heightProperty()); + dfList.prefWidthProperty().bind(this.box.widthProperty()); + dfList.setOnMouseClicked(e -> { + dfArea.setText(dfList.getSelectionModel().getSelectedItem().longDescription()); + e.consume(); + }); + + return dfList; + } + + /** + * Method for generating a VBox containing the buttons for de/selecting items + * for the Selection Box. + * + * @return VBox + */ + private VBox init_rowOneButtons() { + VBox box = new VBox(5); + Region region1 = new Region(); + Region region2 = new Region(); + Button left = new Button("<-"); + Button right = new Button("->"); + Button clear = new Button("Clear"); + Button all = new Button("All"); + + left.setTooltip(new Tooltip("Remove")); + right.setTooltip(new Tooltip("Add")); + clear.setTooltip(new Tooltip("Remove all")); + all.setTooltip(new Tooltip("Select all Analysis Drivers")); + + box.setMinSize(50, 0); + + VBox.setVgrow(region1, Priority.ALWAYS); + VBox.setVgrow(region2, Priority.ALWAYS); + left.setOnAction(e -> { + if (!JAPI.getAnalysisDrivers().isEmpty()) { + String selection = selList.getSelectionModel().getSelectedItem().displayName(); + if (selection.contains("with")) { + dfRemove(selList.getSelectionModel().getSelectedItem()); + } else { + anDeselected(selList.getSelectionModel().getSelectedItem()); + } + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.refresh(); + } + e.consume(); + }); + right.setOnAction(e -> { + if (dfList.getSelectionModel().isEmpty()) { + anSelected(anList.getSelectionModel().getSelectedItem()); + } else { + dfAdd(dfList.getSelectionModel().getSelectedItem(), anList.getSelectionModel().getSelectedItem()); + dfList.getSelectionModel().clearSelection(); + } + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.getSelectionModel().selectLast(); + selList.getFocusModel().focusNext(); + selList.refresh(); + // this.selList.getSelectionModel().select(this.selItems.getLast()); + e.consume(); + }); + clear.setOnAction(e -> { + if (!JAPI.getAnalysisDrivers().isEmpty()) { + JAPI.removeAllAnalysisDrivers(); + selItems.clear(); + selList.setItems(selItems); + selList.refresh(); + } + e.consume(); + + }); + all.setOnAction(e -> { + allSelected(); + e.consume(); + }); + + box.getChildren().addAll(region1, right, left, all, clear, region2); + box.setAlignment(Pos.TOP_CENTER); + + return box; + + } + + /** + * Method for initializing the Distance Function Master List. + */ + private void init_distanceFunctions() { + DistanceFunctionsMasterList = new ArrayList(); + for (int i = 0; i < DistanceFunctions.getDistanceFunctions().size(); i++) { + DistanceFunction distanceFunction = DistanceFunctions.getDistanceFunctions().get(i); + if (distanceFunction.showInGUI()) + DistanceFunctionsMasterList.add(distanceFunction); + } + } + + /** + * Method for initializing the Analysis Driver Master List. + */ + private void init_analysisDrivers() { + AnalysisDriverMasterList = new ArrayList(); + for (int i = 0; i < AnalysisDrivers.getAnalysisDrivers().size(); i++) { + AnalysisDriver analysisDriver = AnalysisDrivers.getAnalysisDrivers().get(i); + if (analysisDriver.showInGUI()) + AnalysisDriverMasterList.add(analysisDriver); + } + } + + /** + * Method for adding an analysis driver. + * + * @param obj Analysis Driver + */ + private void anSelected(AnalysisDriver obj) { + String method = obj.displayName(); + logger.info("Adding Analysis Method " + method); + try { + JAPI.addAnalysisDriver(method); + } catch (Exception e) { + logger.info(e.getCause()); + e.printStackTrace(); + } + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.refresh(); + } + /** + * Select all Analysis Drivers. + */ + private void allSelected() { + logger.info("Adding All Analysis Methods"); + for (AnalysisDriver temp : AnalysisDriverMasterList) { + try { + JAPI.addAnalysisDriver(temp.displayName()); + } catch (Exception e) { + logger.info(e.getCause()); + e.printStackTrace(); + } + } + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.refresh(); + } + + /** + * Method for removing an Analysis Driver. + * + * @param obj Analysis Driver. + */ + private void anDeselected(AnalysisDriver obj) { + String method = obj.displayName(); + logger.info("Removing Analysis Method " + method); + JAPI.removeAnalysisDriver(obj); + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.refresh(); + } + /** + * Add a Distance Function to the selected Analysis Function. + * @param dis DistanceFunction + * @param ana AnalysisDriver + */ + + private void dfAdd(DistanceFunction dis, AnalysisDriver ana) { + AnalysisDriver and = null; + String method = dis.displayName(); + logger.info("Adding Distance Function " + method); + if (ana.displayName().contains("with")) { + String[] temp = ana.displayName().replace(" with metric ", ":").split("\\:"); + try { + and = JAPI.addAnalysisDriver(temp[0]); + } catch (Exception e) { + logger.info(e.getCause()); + e.printStackTrace(); + } + } else { + try { + and = JAPI.addAnalysisDriver(ana.displayName()); + } catch (Exception e) { + logger.info(e.getCause()); + e.printStackTrace(); + } + } + + if (and instanceof NeighborAnalysisDriver) { + // If the analysis driver that was selected requires a distance, + // add the selected distance function. + try { + JAPI.addDistanceFunction(dis.displayName(), and); + } catch (Exception e) { + logger.info(e.getCause()); + e.printStackTrace(); + } + } else if (and instanceof NonDistanceDependentAnalysisDriver) { + // If the analysis driver that was selected is dependent on + // another analysis driver being selected, add the one that + // that is selected. + try { + JAPI.addAnalysisDriverAsParamToOther(method, + (NonDistanceDependentAnalysisDriver) and); + } catch (Exception e) { + logger.info(e.getCause()); + e.printStackTrace(); + } + } + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.refresh(); + } + /** + * Remove a Distance Function and its Analysis Driver. + * + * @param obj AnalysisDriver + */ + + private void dfRemove(AnalysisDriver obj) { + String method = obj.displayName(); + logger.info("Removing Distance Function " + method); + JAPI.removeAnalysisDriver(obj); + selItems = FXCollections.observableArrayList(JAPI.getAnalysisDrivers()); + selList.setItems(selItems); + selList.refresh(); + } + + /** + * Getter method for getting the built pane. + * + * @return VBox + */ + public VBox getPane() { + build_pane(); + logger.info("Finished building Analysis Tab"); + return this.box; + } + + /** + * Method for adding bottom buttons to Panel + * + * @param box HBox + */ + public void setBottomButtons(HBox box) { + bottomButtons = box; + } +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_CanTab.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_CanTab.java new file mode 100644 index 000000000..f9991f27e --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_CanTab.java @@ -0,0 +1,357 @@ +package com.jgaap.GUI; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import org.apache.log4j.Logger; + +import com.jgaap.backend.API; +import com.jgaap.backend.Canonicizers; +import com.jgaap.generics.Canonicizer; +import com.jgaap.util.Document; +import com.jgaap.util.Pair; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.geometry.Pos; +import javafx.scene.control.Button; +import javafx.scene.control.ComboBox; +import javafx.scene.control.Label; +import javafx.scene.control.ListView; +import javafx.scene.control.TextArea; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; + +/** + * Canonicizer Tab Class. + * This Class creates the scene for the Canonicizer Tab and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_CanTab { + + private static HBox bottomButtons; + private static ListView canList; + private static ListView selList; + private static TextArea area; + private static ArrayList CanonicizerMasterList; + private static ArrayList canonName; + private static ArrayList CanonicizerComboBoxModel; + private static HashMap> SelectedCanonicizerMap; + private static List docTypesList; + private static ComboBox comboBox; + private static Logger logger; + private static API JAPI; + private static GUI_NotesWindow noteBox; + private VBox box; + private ObservableList canItems; + private ObservableList selItems; + + /** + * Constructor for the class. + */ + public GUI_CanTab() { + comboBox = new ComboBox(); + logger = Logger.getLogger(GUI_CanTab.class); + docTypesList = new ArrayList(); + CanonicizerComboBoxModel = new ArrayList(); + SelectedCanonicizerMap = new HashMap>(); + box = new VBox(); + noteBox = new GUI_NotesWindow(); + JAPI = API.getInstance(); + init_canonicizers(); + logger.info("Finished building Canonicizer Tab"); + } + + /** + * Builds the pane row by row. + */ + private void build_pane() { + logger.info("Building Canonicizer Tab"); + this.box.getChildren().add(init_rowOne()); + this.box.getChildren().add(init_rowTwo()); + this.box.getChildren().add(bottomButtons); + } + + /** + * Method for building the 'Top Row' of GUI elements. + * + * @return HBox + */ + private HBox init_rowOne() { + HBox box = new HBox(5); + HBox selNotes = new HBox(); + VBox canBox = new VBox(); + VBox selBox = new VBox(); + Label can = new Label("Canonicizers"); + Label sel = new Label("Selected"); + Button notes = noteBox.getButton(); + Region region1 = new Region(); + + HBox.setHgrow(region1, Priority.ALWAYS); + // HBox.setHgrow(region2, Priority.ALWAYS); + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + sel.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + selNotes.getChildren().addAll(sel, region1, notes); + canBox.getChildren().addAll(can, init_listLeft()); + selBox.getChildren().addAll(selNotes, init_listRight()); + + box.getChildren().addAll(canBox, init_rowTwoButtons(), selBox); + return box; + } + + /** + * Method for building the 'Second Row' of GUI elements. + * + * @return VBox + */ + private VBox init_rowTwo() { + VBox box = new VBox(5); + Label can = new Label("Canonicizer Description"); + area = new TextArea(); + + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + area.setText(""); + area.setWrapText(true); + area.setEditable(false); + area.prefHeightProperty().bind(this.box.heightProperty()); + area.prefWidthProperty().bind(this.box.widthProperty()); + box.getChildren().add(can); + box.getChildren().add(area); + + return box; + + } + + /** + * Method for generating the List Box of Canocinizers. + * + * @return ListView + */ + private ListView init_listLeft() { + canList = new ListView(); + canonName = new ArrayList(); + for (Canonicizer i : CanonicizerMasterList) { + canonName.add(i.displayName()); + } + this.canItems = FXCollections.observableArrayList(canonName); + + canList.setItems(this.canItems); + canList.prefHeightProperty().bind(this.box.heightProperty()); + canList.prefWidthProperty().bind(this.box.widthProperty()); + canList.setOnMouseClicked(e -> { + String sel = canList.getSelectionModel().getSelectedItem(); + Iterator iter = CanonicizerMasterList.iterator(); + while(iter.hasNext()){ + Canonicizer temp = iter.next(); + if(sel.equalsIgnoreCase(temp.displayName())){ + area.setText(temp.longDescription()); + } + } + e.consume(); + }); + + return canList; + } + + /** + * Method for generating List Box of selected Canocinizers. + * + * @return ListView + */ + private ListView init_listRight(){ + selList = new ListView(); + this.selItems = FXCollections.observableList(SelectedCanonicizerMap.keySet().parallelStream().toList()); + + selList.setItems(this.selItems); + selList.prefHeightProperty().bind(this.box.heightProperty()); + selList.prefWidthProperty().bind(this.box.widthProperty()); + selList.setOnMouseClicked(e -> { + String sel = selList.getSelectionModel().getSelectedItem(); + Iterator iter = CanonicizerMasterList.iterator(); + while(iter.hasNext()){ + Canonicizer temp = iter.next(); + if(sel.equalsIgnoreCase(temp.displayName())){ + area.setText(temp.longDescription()); + } + } + e.consume(); + }); + + return selList; + } + + /** + * Method for generating a VBox containing the buttons for de/selecting items + * for the Selection Box. + * + * @return VBox + */ + private VBox init_rowTwoButtons() { + VBox box = new VBox(5); + Button left = new Button("<-"); + Button right = new Button("->"); + Button clear = new Button("Clear"); + Region region1 = new Region(); + Region region2 = new Region(); + VBox.setVgrow(region1, Priority.ALWAYS); + VBox.setVgrow(region2, Priority.ALWAYS); + left.setTooltip(new Tooltip("Remove")); + right.setTooltip(new Tooltip("Add")); + clear.setTooltip(new Tooltip("Remove all")); + left.setOnAction(e -> { + if(!SelectedCanonicizerMap.isEmpty()){ + Iterator iter = SelectedCanonicizerMap.keySet().iterator(); + while (iter.hasNext()) { + String i = iter.next(); + if(selList.getSelectionModel().getSelectedItem().equalsIgnoreCase(i)){ + canonDeselected(i); + } + } + selList.refresh(); + canList.refresh(); + } + e.consume(); + }); + right.setOnAction(e -> { + for (Canonicizer i : CanonicizerMasterList) { + if(canList.getSelectionModel().getSelectedItem().equalsIgnoreCase(i.displayName())){ + canonSelected(i, comboBox.getSelectionModel().getSelectedItem()); + } + } + selList.refresh(); + canList.refresh(); + e.consume(); + }); + clear.setOnAction(e -> { + if(!SelectedCanonicizerMap.isEmpty()){ + SelectedCanonicizerMap.clear(); + this.canItems = FXCollections.observableArrayList(canonName); + this.selItems = FXCollections.observableList(SelectedCanonicizerMap.keySet().parallelStream().toList()); + canList.setItems(this.canItems); + selList.setItems(this.selItems); + selList.refresh(); + canList.refresh(); + } + e.consume(); + }); + + box.getChildren().addAll(region1, init_rowTwoSelectionDropDown(), right, left, clear, region2); + box.setAlignment(Pos.BASELINE_CENTER); + + return box; + } + + /** + * Method for creation of the document format selection box. + * + * @return ComboBox + */ + private ComboBox init_rowTwoSelectionDropDown() { + UpdateCanonicizerDocTypeComboBox(); + comboBox.setMinSize(100, 25); + comboBox.getSelectionModel().select(0); + + return comboBox; + } + /** + * Method for building the Canonicizer Master List. + */ + private void init_canonicizers() { + CanonicizerMasterList = new ArrayList(); + for (int i = 0; i < Canonicizers.getCanonicizers().size(); i++) { + Canonicizer canonicizer = Canonicizers.getCanonicizers().get(i); + if (canonicizer.showInGUI()) + CanonicizerMasterList.add(canonicizer); + } + } + /** + * Method for Adding a Canonicizer. + * + * @param method Canonicizer + * @param doc Document or String + */ + private void canonSelected(Canonicizer method, Object doc) { + logger.info("Adding Canonicizer "+method.displayName()); + Pair temp = new Pair(method, doc); + String key = temp.getFirst().displayName()+" ["+comboBox.getSelectionModel().getSelectedItem()+"]"; + SelectedCanonicizerMap.put(key, temp); + + this.selItems = FXCollections.observableList(SelectedCanonicizerMap.keySet().parallelStream().toList()); + canList.setItems(this.canItems); + selList.setItems(this.selItems); + selList.getSelectionModel().select(this.selItems.getLast()); + } + /** + * Method for removing a selected Canonicizer. + * + * @param key String + */ + private void canonDeselected(String key) { + logger.info("Removing Canonicizer "+key); + SelectedCanonicizerMap.remove(key); + this.canItems = FXCollections.observableArrayList(canonName); + this.selItems = FXCollections.observableArrayList(SelectedCanonicizerMap.keySet().parallelStream().toList()); + canList.setItems(this.canItems); + selList.setItems(this.selItems); + } + /** + * Method for updating the ComboBox Element for the Canonicizer. + */ + public static void UpdateCanonicizerDocTypeComboBox() { + logger.info("Updating Canonicizer ComboBox"); + comboBox.getItems().clear(); + CanonicizerComboBoxModel.clear(); + docTypesList.clear(); + docTypesList.add("All"); + docTypesList.add(Document.Type.GENERIC); + docTypesList.add(Document.Type.DOC); + docTypesList.add(Document.Type.PDF); + docTypesList.add(Document.Type.HTML); + for(Document document : JAPI.getDocuments()){ + docTypesList.add(document.getTitle()); + } + for(Object obj : docTypesList){ + CanonicizerComboBoxModel.add(obj.toString()); + } + comboBox.setItems(FXCollections.observableArrayList(CanonicizerComboBoxModel)); + comboBox.getSelectionModel().select(0); + } + + /** + * Returns the built Pane. + * + * @return VBox + */ + public VBox getPane() { + logger.info("Finished building Canonicizer Tab"); + build_pane(); + return this.box; + } + /** + * Sets the bottom row buttons. + * + * @param box HBox + */ + public void setBottomButtons(HBox box){ + bottomButtons = box; + } + /** + * Gives the current selected Canonicizers. + * + * @return HashMap> + */ + public static HashMap> getSelectedCanList(){ + return SelectedCanonicizerMap; + } + +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_DocTab.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_DocTab.java new file mode 100644 index 000000000..ed0ded40f --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_DocTab.java @@ -0,0 +1,337 @@ +package com.jgaap.GUI; + +import java.util.Iterator; +import java.util.List; + +import org.apache.log4j.Logger; + +import com.jgaap.backend.API; +import com.jgaap.backend.Languages; +import com.jgaap.generics.Language; +import com.jgaap.util.Document; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.scene.control.Label; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TreeItem; +import javafx.scene.control.TreeView; +import javafx.scene.control.cell.PropertyValueFactory; +import javafx.scene.control.Alert; +import javafx.scene.control.Alert.AlertType; +import javafx.scene.control.Button; +import javafx.scene.control.ButtonType; +import javafx.scene.control.ComboBox; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; +import javafx.stage.FileChooser; +import javafx.stage.Stage; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; + +/** + * Document Tab Class. + * This Class creates the scene for the Document Tab and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_DocTab { + private static GUI_NotesWindow noteBox; + private static Logger logger; + private static Stage mainStageRef; + private static API JAPI; + private static TableView table; + private static TreeItem rootNode; + private static TreeView tree; + private static HBox bottomButtons; + private VBox box; + + /** + * Constructor for the class. + */ + public GUI_DocTab(Stage stage) { + rootNode = new TreeItem("Authors"); + tree = new TreeView(rootNode); + noteBox = new GUI_NotesWindow(); + logger = Logger.getLogger(GUI_DocTab.class); + JAPI = API.getInstance(); + mainStageRef = stage; + this.box = new VBox(); + } + + /** + * Builds the window row by row. + */ + private void build_tab() { + logger.info("Building Document Tab"); + this.box.getChildren().add(init_LangSelection()); + this.box.getChildren().add(init_UnknownAuth()); + this.box.getChildren().add(init_UnknownAuthButtons()); + this.box.getChildren().add(init_KnownAuth()); + this.box.getChildren().add(init_KnownAuthButtons()); + this.box.getChildren().add(bottomButtons); + } + + /* + * Method for building the Language Selection row. + */ + private VBox init_LangSelection() { + VBox box = new VBox(5); + HBox hbox; + + Label lang = new Label("Language"); + lang.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + Button notes = noteBox.getButton(); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + hbox = new HBox(lang, region1, notes); + + ComboBox langSelect = init_langSelectBox(); + + box.getChildren().add(hbox); + box.getChildren().add(langSelect); + + return box; + } + + /** + * Method for building the Unknown Author Row. + */ + private VBox init_UnknownAuth() { + VBox box = new VBox(5); + init_unknownAuthorTable(); + Label unAuth = new Label("Uknown Authors"); + unAuth.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + table.prefHeightProperty().bind(this.box.heightProperty()); + table.prefWidthProperty().bind(this.box.widthProperty()); + + box.getChildren().add(unAuth); + box.getChildren().add(table); + + return box; + } + + /** + * Method for building the Known Author Row. + * + * @return VBox + */ + private VBox init_KnownAuth() { + VBox box = new VBox(5); + Label knAuth = new Label("Known Authors"); + knAuth.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + tree.prefHeightProperty().bind(this.box.heightProperty()); + tree.prefWidthProperty().bind(this.box.widthProperty()); + box.getChildren().add(knAuth); + box.getChildren().add(tree); + return box; + } + + /** + * Method for Building the Unknown Author Row Buttons. + * + * @return HBox + */ + private HBox init_UnknownAuthButtons() { + HBox box = new HBox(5); + Button addDoc = new Button("Add Document"); + Button remDoc = new Button("Remove Document"); + //=============================================================================== + addDoc.setOnAction(e -> { + String filepath = ""; + FileChooser FileChoser = new FileChooser(); + List choice = FileChoser.showOpenMultipleDialog(mainStageRef); + for (File file : choice) { + try { + JAPI.addDocument(file.getCanonicalPath(), "", ""); + filepath = file.getCanonicalPath(); + GUI_CanTab.UpdateCanonicizerDocTypeComboBox(); + } catch (Exception ex) { + logger.error("Error adding document(s)", ex); + if (filepath != null) { + ex.printStackTrace(); + Alert error = new Alert(AlertType.ERROR, ex.getMessage()); + error.showAndWait() + .filter(response -> response == ButtonType.OK) + .ifPresent(response -> error.close()); + } + } + } + updateUnknownDocumentsTable(); + e.consume(); + }); + //=============================================================================== + //=============================================================================== + remDoc.setOnAction(e -> { + ObservableList docs = table.getSelectionModel().getSelectedItems(); + for(Document i : docs){ + JAPI.removeDocument(i); + } + table.getItems().removeAll(docs); + updateUnknownDocumentsTable(); + e.consume(); + }); + //=============================================================================== + box.getChildren().add(addDoc); + box.getChildren().add(remDoc); + return box; + } + + /** + * Method for building the Known Author Buttons. + * + * @return HBox + */ + private HBox init_KnownAuthButtons() { + HBox box = new HBox(5); + Button addAuth = new Button("Add Author"); + Button editAuth = new Button("Edit Author"); + Button remAuth = new Button("Remove Author"); + //=============================================================================== + addAuth.setOnAction(e -> { + GUI_AddAuthor pop = new GUI_AddAuthor(); + Stage stage = pop.getStage(); + stage.show(); + GUI_CanTab.UpdateCanonicizerDocTypeComboBox(); + e.consume(); + }); + //=============================================================================== + //=============================================================================== + editAuth.setOnAction(e -> { + GUI_AddAuthor pop = new GUI_AddAuthor(tree.getSelectionModel().getSelectedItem().getValue()); + Stage stage = pop.getStage(); + stage.show(); + GUI_CanTab.UpdateCanonicizerDocTypeComboBox(); + e.consume(); + }); + //=============================================================================== + //=============================================================================== + remAuth.setOnAction(e -> { + Iterator> iter = tree.getSelectionModel().getSelectedItems().iterator(); + while(iter.hasNext()){ + Iterator docIter = JAPI.getDocumentsByAuthor(iter.next().getValue().trim()).iterator(); + while(docIter.hasNext()){ + JAPI.removeDocument(docIter.next()); + JAPI.getAuthors(); + } + } + updateAuthorTree(); + GUI_CanTab.UpdateCanonicizerDocTypeComboBox(); + e.consume(); + }); + //=============================================================================== + box.getChildren().add(addAuth); + box.getChildren().add(editAuth); + box.getChildren().add(remAuth); + return box; + } + + + /** + * Method for building the Author Selection Table. + */ + private void init_unknownAuthorTable() { + table = new TableView(); + TableColumn column1 = new TableColumn("Title"); + TableColumn column2 = new TableColumn("File Path"); + column1.setCellValueFactory(new PropertyValueFactory("title")); + column2.setCellValueFactory(new PropertyValueFactory("FilePath")); + column1.prefWidthProperty().bind(table.widthProperty().divide(2)); + column2.prefWidthProperty().bind(table.widthProperty().divide(2)); + table.getColumns().add(column1); + table.getColumns().add(column2); + table.setItems(FXCollections.observableArrayList(JAPI.getUnknownDocuments())); + } + + /** + * Method for building the Language Selection Combo Box. + * + * @return ComboBox + */ + private ComboBox init_langSelectBox() { + ComboBox comboBox; + ObservableList options; + options = FXCollections.observableArrayList(populateLanguageMasterList()); + comboBox = new ComboBox(options); + comboBox.getSelectionModel().select("English"); + comboBox.setOnAction(e -> { + try { + JAPI.setLanguage(comboBox.getSelectionModel().getSelectedItem()); + } catch (Exception e1) { + logger.error(e1.getCause(), e1); + e1.printStackTrace(); + } + e.consume(); + }); + return comboBox; + } + /** + * Updates the unknown document table. + */ + public static void updateUnknownDocumentsTable(){ + table.setItems(FXCollections.observableArrayList(JAPI.getUnknownDocuments())); + table.refresh(); + } + /** + * Method for building the Author Tree View + */ + public static void updateAuthorTree(){ + List authors = JAPI.getAuthors(); + List> authNode = new ArrayList>(); + TreeItem node = new TreeItem(); + List docs = Collections.emptyList(); + for(String i : authors){ + node = new TreeItem(i); + docs = JAPI.getDocumentsByAuthor(i); + for(Document k : docs){ + TreeItem temp = new TreeItem(k.getFilePath()); + node.getChildren().add(temp); + } + authNode.add(node); + } + rootNode.getChildren().clear(); + rootNode.getChildren().addAll(authNode); + //tree = new TreeView(rootNode); + tree.refresh(); + } + /** + * Populate the master list of languages. + * + * @return List + */ + private List populateLanguageMasterList(){ + List LanguagesMasterList = new ArrayList(); + for (Language language : Languages.getLanguages()) { + if (language.showInGUI()) + LanguagesMasterList.add(language.displayName()); + } + return LanguagesMasterList; + } + + /** + * Getter for getting the built Pane. + * + * @return VBox + */ + public VBox getPane() { + logger.info("Finished building Document Tab"); + build_tab(); + return this.box; + } + /** + * Set the bottom buttons of the tab. + * + * @param box HBox + */ + public void setBottomButtons(HBox box){ + bottomButtons = box; + } +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_ECTab.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_ECTab.java new file mode 100644 index 000000000..485c0ed0a --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_ECTab.java @@ -0,0 +1,341 @@ +package com.jgaap.GUI; + +import java.util.ArrayList; + +import org.apache.log4j.Logger; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.geometry.Pos; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ListCell; +import javafx.scene.control.ListView; +import javafx.scene.control.TextArea; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; +import com.jgaap.generics.EventCuller; +import com.jgaap.backend.EventCullers; +import com.jgaap.backend.API; + +/** + * Event Culling Tab Class. + * This Class creates the scene for the Event CUlling Tab and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_ECTab { + + private VBox paraBox, paraBoxChild, box; + private static ObservableList eventCullers; + private static ObservableList selected; + private static ArrayList EventCullersMasterList; + private static ListView listLeft; + private static ListView listRight; + private static HBox bottomButtons; + private static TextArea area; + private static Logger logger; + private static API JAPI; + private static GUI_NotesWindow noteBox; + + /** + * Constructor for the class. + */ + public GUI_ECTab() { + logger = Logger.getLogger(GUI_ECTab.class); + JAPI = API.getInstance(); + init_eventCullers(); + box = new VBox(); + noteBox = new GUI_NotesWindow(); + } + + /** + * Method for building the Window row by row. + */ + private void build_pane() { + logger.info("Building Event Culler Tab"); + this.box.getChildren().add(init_rowOne()); + this.box.getChildren().add(init_rowTwo()); + this.box.getChildren().add(bottomButtons); + } + + /** + * Method for building the 'Top Level' of GUI Elements. + * + * @return HBox + */ + private HBox init_rowOne() { + Label can = new Label("Event Culling"); + Label sel = new Label("Selected"); + Label para = new Label("Parameters"); + Button notes = noteBox.getButton(); + HBox box = new HBox(5); + HBox notesBox = new HBox(); + VBox edBox = new VBox(); + VBox selBox = new VBox(); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + this.paraBox = new VBox(); + this.paraBoxChild = new VBox(); + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + sel.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + para.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + paraBoxChild.setStyle("-fx-border-color: black"); + paraBoxChild.prefHeightProperty().bind(this.box.heightProperty()); + paraBoxChild.prefWidthProperty().bind(this.box.widthProperty()); + + notesBox.getChildren().addAll(para, region1, notes); + + edBox.getChildren().addAll(can, init_ListLeft()); + selBox.getChildren().addAll(sel, init_ListRight()); + paraBox.getChildren().addAll(notesBox, paraBoxChild); + + box.getChildren().addAll(edBox, init_rowTwoButtons(), selBox, paraBox); + + return box; + } + + /** + * Method for building the 'Second level' of GUI elements. + * + * @return VBox + */ + private VBox init_rowTwo() { + VBox box = new VBox(5); + Label can = new Label("Event Culling Description"); + area = new TextArea(); + + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + area.setText(""); + area.setWrapText(true); + area.setEditable(false); + area.prefHeightProperty().bind(this.box.heightProperty()); + area.prefWidthProperty().bind(this.box.widthProperty()); + box.getChildren().add(can); + box.getChildren().add(area); + + return box; + + } + + /** + * Method for building the Event Culling Selection Box. + * + * @return ListView + */ + private ListView init_ListLeft() { + listLeft = new ListView(); + eventCullers = FXCollections.observableArrayList(EventCullersMasterList); + + listLeft.setItems(eventCullers); + listLeft.setOnMouseClicked(e -> { + area.setText(listLeft.getSelectionModel().getSelectedItem().longDescription()); + e.consume(); + }); + listLeft.setCellFactory(param -> new ListCell() { + @Override + protected void updateItem(EventCuller item, boolean empty) { + super.updateItem(item, empty); + if (empty || item == null || item.displayName().equalsIgnoreCase("")) { + setText(""); + } else { + setText(item.displayName()); + } + } + }); + listLeft.prefHeightProperty().bind(this.box.heightProperty()); + listLeft.prefWidthProperty().bind(this.box.widthProperty()); + + return listLeft; + } + + /** + * Method for showing the Selected Event Culling box. + * + * @return ListView + */ + private ListView init_ListRight() { + listRight = new ListView(); + selected = FXCollections.observableArrayList(JAPI.getEventCullers()); + listRight.setItems(selected); + listRight.setCellFactory(param -> new ListCell() { + @Override + protected void updateItem(EventCuller item, boolean empty) { + super.updateItem(item, empty); + if (empty || item == null || item.displayName().equalsIgnoreCase("")) { + setText(""); + } else { + setText(item.displayName()); + } + } + }); + listRight.setOnMouseClicked(e -> { + EventCuller sel = listRight.getSelectionModel().getSelectedItem(); + VBox para = sel.getNewGUILayout(); + para.prefHeightProperty().bind(this.box.heightProperty()); + para.prefWidthProperty().bind(this.box.widthProperty()); + this.paraBox.getChildren().removeLast(); + this.paraBox.getChildren().add(para); + area.setText(sel.longDescription()); + e.consume(); + }); + + listRight.prefHeightProperty().bind(this.box.heightProperty()); + listRight.prefWidthProperty().bind(this.box.widthProperty()); + + return listRight; + } + + /** + * Method for generating the selection box buttons. + * + * @return VBox + */ + private VBox init_rowTwoButtons() { + VBox box = new VBox(5); + Region region1 = new Region(); + Region region2 = new Region(); + Button left = new Button("<-"); + Button right = new Button("->"); + Button clear = new Button("Clear"); + Button all = new Button("All"); + left.setTooltip(new Tooltip("Remove")); + right.setTooltip(new Tooltip("Add")); + clear.setTooltip(new Tooltip("Remove all")); + all.setTooltip(new Tooltip("Select all")); + box.setMinSize(50, 0); + + VBox.setVgrow(region1, Priority.ALWAYS); + VBox.setVgrow(region2, Priority.ALWAYS); + + left.setOnAction(e -> { + if (!JAPI.getEventCullers().isEmpty()) { + ecDeselected(listRight.getSelectionModel().getSelectedItem()); + listRight.refresh(); + } + e.consume(); + }); + right.setOnAction(e -> { + ecSelected(listLeft.getSelectionModel().getSelectedItem()); + listRight.refresh(); + listRight.getSelectionModel().select(selected.getLast()); + e.consume(); + }); + all.setOnAction(e -> { + allSelected(); + listRight.refresh(); + e.consume(); + }); + clear.setOnAction(e -> { + if (!JAPI.getEventDrivers().isEmpty()) { + clearSelected(); + listRight.refresh(); + } + e.consume(); + }); + + box.getChildren().addAll(region1, right, left, all, clear, region2); + box.setAlignment(Pos.TOP_CENTER); + + return box; + } + + /** + * Method for initializing the Event Culler Master list. + */ + private void init_eventCullers() { + EventCullersMasterList = new ArrayList(); + for (int i = 0; i < EventCullers.getEventCullers().size(); i++) { + EventCuller eventCuller = EventCullers.getEventCullers().get(i); + if (eventCuller.showInGUI()) { + EventCullersMasterList.add(eventCuller); + } + } + } + + /** + * Method for adding a selected Event Culler. + * + * @param method String + */ + private void ecSelected(EventCuller obj) { + String method = obj.displayName(); + logger.info("Adding Event Culler " + method); + try { + JAPI.addEventCuller(method); + } catch (Exception e) { + logger.error(e.getCause(), e); + e.printStackTrace(); + } + selected = FXCollections.observableArrayList(JAPI.getEventCullers()); + listRight.setItems(selected); + } + + /** + * Method for adding all Event Cullers + */ + private void allSelected() { + logger.info("Adding all Event Cullers"); + for (EventCuller i : EventCullersMasterList) { + try { + JAPI.addEventCuller(i.displayName()); + } catch (Exception e) { + logger.error(e.getCause(), e); + e.printStackTrace(); + } + } + selected = FXCollections.observableArrayList(JAPI.getEventCullers()); + listRight.setItems(selected); + } + + /** + * Method to delete all selected Event Cullers. + */ + private void clearSelected() { + logger.info("Removing all selected Event Cullers"); + JAPI.removeAllEventCullers(); + selected = FXCollections.observableArrayList(JAPI.getEventCullers()); + listRight.setItems(selected); + } + + /** + * Method for removing a selected Event Culler. + * + * @param method String + */ + private void ecDeselected(EventCuller obj) { + String method = obj.displayName(); + logger.info("Removing Event Culler " + method); + JAPI.removeEventCuller(obj); + selected = FXCollections.observableArrayList(JAPI.getEventCullers()); + listRight.setItems(selected); + } + + /** + * Getter for getting the built Pane. + * + * @return VBox + */ + public VBox getPane() { + logger.info("Finished building Event Culler Tab"); + build_pane(); + return this.box; + } + + /** + * Method for applying the bottom buttons to the panel. + * + * @param box HBox + */ + public void setBottomButtons(HBox box) { + bottomButtons = box; + } + +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_EDTab.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_EDTab.java new file mode 100644 index 000000000..70cbbf184 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_EDTab.java @@ -0,0 +1,339 @@ +package com.jgaap.GUI; + +import java.util.ArrayList; + +import org.apache.log4j.Logger; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.geometry.Pos; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ListCell; +import javafx.scene.control.ListView; +import javafx.scene.control.TextArea; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; + +import com.jgaap.generics.EventDriver; +import com.jgaap.backend.EventDrivers; +import com.jgaap.backend.API; + +/** + * Event Driver Tab Class. + * This Class creates the scene for the Event Driver Tab and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_EDTab { + + private VBox box, paraBoxChild, paraBox; + private static ArrayList EventDriverMasterList; + private static ObservableList selected; + private static ObservableList eventDrivers; + private static ListView edList; + private static ListView selList; + private static TextArea area; + private static HBox bottomButtons, notesBox; + private static API JAPI; + private static Logger logger; + private static GUI_NotesWindow noteBox; + + /** + * Constructor for the class. + */ + public GUI_EDTab() { + logger = Logger.getLogger(GUI_EDTab.class); + JAPI = API.getInstance(); + init_EventDrivers(); + box = new VBox(); + noteBox = new GUI_NotesWindow(); + } + + /** + * Method for building the Window row by row. + */ + private void build_pane() { + logger.info("Building Event Driver Tab"); + this.box.getChildren().add(init_rowOne()); + this.box.getChildren().add(init_rowTwo()); + this.box.getChildren().add(bottomButtons); + } + + /** + * Method for building the 'Top Level' of GUI Elements. + * + * @return HBox + */ + private HBox init_rowOne() { + Label can = new Label("Event Drivers"); + Label sel = new Label("Selected"); + Label para = new Label("Parameters"); + Button notes = noteBox.getButton(); + HBox box = new HBox(5); + VBox edBox = new VBox(); + VBox selBox = new VBox(); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + notesBox = new HBox(); + paraBox = new VBox(); + paraBoxChild = new VBox(); + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + sel.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + para.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + paraBoxChild.setStyle("-fx-border-color: black"); + paraBoxChild.prefHeightProperty().bind(this.box.heightProperty()); + paraBoxChild.prefWidthProperty().bind(this.box.widthProperty()); + + notesBox.getChildren().addAll(para, region1, notes); + + edBox.getChildren().addAll(can, init_ListLeft()); + selBox.getChildren().addAll(sel, init_ListRight()); + paraBox.getChildren().addAll(notesBox, paraBoxChild); + + box.getChildren().addAll(edBox, init_rowTwoButtons(), selBox, paraBox); + + return box; + } + + /** + * Method for building the 'Second level' of GUI elements. + * + * @return + */ + private VBox init_rowTwo() { + VBox box = new VBox(5); + Label can = new Label("Event Driver Description"); + area = new TextArea(); + + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + area.setText(""); + area.setWrapText(true); + area.setEditable(false); + area.prefHeightProperty().bind(this.box.heightProperty()); + area.prefWidthProperty().bind(this.box.widthProperty()); + box.getChildren().add(can); + box.getChildren().add(area); + + return box; + + } + + /** + * Method for building the Event Driver Selection Box. + * + * @return ListView + */ + private ListView init_ListLeft() { + edList = new ListView(); + eventDrivers = FXCollections.observableArrayList(EventDriverMasterList); + + edList.setItems(eventDrivers); + edList.setOnMouseClicked(e -> { + area.setText(edList.getSelectionModel().getSelectedItem().longDescription()); + e.consume(); + }); + edList.setCellFactory(param -> new ListCell(){ + @Override + protected void updateItem(EventDriver item, boolean empty){ + super.updateItem(item, empty); + if(empty || item == null || item.displayName().equalsIgnoreCase("")){ + setText(""); + } else { + setText(item.displayName()); + } + } + }); + edList.prefHeightProperty().bind(this.box.heightProperty()); + edList.prefWidthProperty().bind(this.box.widthProperty()); + + return edList; + } + + /** + * Method for showing the Selected Driver Culling box. + * + * @return ListView + */ + private ListView init_ListRight() { + selList = new ListView(); + selected = FXCollections.observableArrayList(JAPI.getEventDrivers()); + selList.setItems(selected); + selList.setCellFactory(param -> new ListCell(){ + @Override + protected void updateItem(EventDriver item, boolean empty){ + super.updateItem(item, empty); + if(empty || item == null || item.displayName().equalsIgnoreCase("")){ + setText(""); + } else { + setText(item.displayName()); + } + } + }); + selList.setOnMouseClicked(e -> { + EventDriver sel = selList.getSelectionModel().getSelectedItem(); + VBox para = sel.getNewGUILayout(); + para.prefHeightProperty().bind(this.box.heightProperty()); + para.prefWidthProperty().bind(this.box.widthProperty()); + this.paraBox.getChildren().removeLast(); + this.paraBox.getChildren().add(para); + area.setText(sel.longDescription()); + e.consume(); + }); + + selList.prefHeightProperty().bind(this.box.heightProperty()); + selList.prefWidthProperty().bind(this.box.widthProperty()); + + return selList; + } + + /** + * Method for generating the selection box buttons. + * + * @return VBox + */ + private VBox init_rowTwoButtons() { + VBox box = new VBox(5); + Region region1 = new Region(); + Region region2 = new Region(); + Button left = new Button("<-"); + Button right = new Button("->"); + Button clear = new Button("Clear"); + Button all = new Button("All"); + left.setTooltip(new Tooltip("Remove")); + right.setTooltip(new Tooltip("Add")); + clear.setTooltip(new Tooltip("Remove all")); + all.setTooltip(new Tooltip("Select all")); + + box.setMinSize(50, 0); + + VBox.setVgrow(region1, Priority.ALWAYS); + VBox.setVgrow(region2, Priority.ALWAYS); + + left.setOnAction(e -> { + if(!JAPI.getEventDrivers().isEmpty()){ + edDeselected(selList.getSelectionModel().getSelectedItem()); + selList.refresh(); + } + e.consume(); + }); + right.setOnAction(e -> { + edSelected(edList.getSelectionModel().getSelectedItem()); + selList.refresh(); + selList.getSelectionModel().select(selected.getLast()); + e.consume(); + }); + all.setOnAction(e -> { + allSelected(); + selList.refresh(); + edList.refresh(); + e.consume(); + }); + clear.setOnAction(e -> { + if(!JAPI.getEventDrivers().isEmpty()){ + clearSelected(); + selList.refresh(); + } + e.consume(); + }); + + box.getChildren().addAll(region1, right, left, all, clear, region2); + box.setAlignment(Pos.TOP_CENTER); + + return box; + } + /** + * Method for initializing the Event Driver Master List. + */ + private void init_EventDrivers() { + EventDriverMasterList = new ArrayList(); + for (int i = 0; i < EventDrivers.getEventDrivers().size(); i++) { + EventDriver eventDriver = EventDrivers.getEventDrivers().get(i); + if (eventDriver.showInGUI()) + EventDriverMasterList.add(eventDriver); + } + } + /** + * Method for adding a selected Event Driver. + * + * @param method EventDriver + */ + private void edSelected(EventDriver obj) { + String method = obj.displayName(); + logger.info("Adding Event Driver "+method); + try { + JAPI.addEventDriver(method); + } catch (Exception e) { + logger.error(e.getCause(), e); + e.printStackTrace(); + } + selected = FXCollections.observableArrayList(JAPI.getEventDrivers()); + selList.setItems(selected); + } + /** + * Method for selecting all Event Drivers + */ + private void allSelected() { + logger.info("Adding all Event Drivers"); + for(EventDriver temp : EventDriverMasterList){ + try { + JAPI.addEventDriver(temp.displayName()); + } catch (Exception e) { + logger.error(e.getCause(), e); + e.printStackTrace(); + } + } + selected = FXCollections.observableArrayList(JAPI.getEventDrivers()); + selList.setItems(selected); + } + /** + * Method to delete all selected Event Drivers. + */ + private void clearSelected(){ + logger.info("Removing all selected Event Drivers"); + JAPI.removeAllEventDrivers(); + selected = FXCollections.observableArrayList(JAPI.getEventDrivers()); + selList.setItems(selected); + //this.paraBox.getChildren().removeLast(); + //this.paraBox.getChildren().add(this.paraBoxChild); + } + /** + * Method for removing selected Event Driver. + * + * @param method EventDriver + */ + private void edDeselected(EventDriver obj) { + String method = obj.displayName(); + logger.info("Removing Event Driver "+method); + JAPI.removeEventDriver(obj); + selected = FXCollections.observableArrayList(JAPI.getEventDrivers()); + selList.setItems(selected); + } + + /** + * Getter for getting the built Pane. + * + * @return VBox + */ + public VBox getPane() { + build_pane(); + logger.info("Finished building Event Culler Tab"); + return this.box; + } + /** + * Method for applying the bottom buttons to the panel. + * + * @param box HBOX + */ + public void setBottomButtons(HBox box) { + bottomButtons = box; + } + +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_JGAAPAboutWindow.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_JGAAPAboutWindow.java new file mode 100644 index 000000000..a5028e197 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_JGAAPAboutWindow.java @@ -0,0 +1,181 @@ +package com.jgaap.GUI; + + +import java.io.IOException; + +import com.jgaap.JGAAPConstants; + +import javafx.geometry.Pos; +import javafx.scene.Scene; +import javafx.scene.control.Alert; +import javafx.scene.control.Alert.AlertType; +import javafx.scene.control.Button; +import javafx.scene.control.ButtonType; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; +import javafx.stage.Stage; +/** + * About Window Class. + * This Class creates the Stage for the About Window and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_JGAAPAboutWindow { + + private static Stage stage; + + /** + * Builds the Window. + */ + private static void build_stage(){ + Scene scene; + VBox box = new VBox(5); + HBox butBox = new HBox(5); + Region region1 = new Region(); + Region region2 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + HBox.setHgrow(region2, Priority.ALWAYS); + + Button close = new Button("Close"); + close.setOnAction(e -> { + if(e.getTarget().toString().contains("Close")){ + stage.close(); + e.consume(); + } + }); + butBox.getChildren().addAll(region1, close, region2); + + box.getChildren().addAll(init_rowOne(),init_rowTwo(),butBox); + + stage = new Stage(); + scene = new Scene(box, 530, 300); + stage.setScene(scene); + stage.setResizable(false); + stage.setTitle("About"); + stage.setOnCloseRequest(e -> { + stage.close(); + e.consume(); + }); + } + + /** + * Method for building the first row of elements. + * + * @return HBox + */ + private static HBox init_rowOne(){ + HBox box = new HBox(5); + Image evlIcon = new Image("/com/jgaap/resources/ui/EVL_Icon_duq.png"); + Image jgaapIcon = new Image("/com/jgaap/resources/ui/jgaap-icon.png"); + ImageView imageView1 = new ImageView(evlIcon); + ImageView imageView2 = new ImageView(jgaapIcon); + imageView1.setFitHeight(100); + imageView1.setFitWidth(120); + imageView1.setSmooth(true); + imageView2.setFitHeight(100); + imageView2.setFitWidth(120); + imageView2.setSmooth(true); + Label aboutLabel = new Label("JGAAP"); + aboutLabel.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 46)); + Region region1 = new Region(); + Region region2 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + HBox.setHgrow(region2, Priority.ALWAYS); + + box.getChildren().addAll(imageView1, region1,aboutLabel,region2, imageView2); + + return box; + } + + /** + * Method for building the second row of elements. + * + * @return VBox + */ + private static VBox init_rowTwo(){ + HBox Labelbox = new HBox(5); + HBox linkBox1 = new HBox(5); + HBox linkBox2 = new HBox(5); + HBox rightsBox = new HBox(5); + VBox box = new VBox(5); + Label lblNewLabel = new Label("JGAAP "+JGAAPConstants.VERSION+", The Java Graphical Authorship Attribution Program\n" + +"\nDeveloped by the EVL lab (Evaluating Variation in Language Labratory) and" + +"\nReleased by Dr. Patrick Juola under the AGPL v3.0"); + Label lblNewLabel_1 = new Label("EVLLabs Website"); + Label lblNewLabel_2 = new Label("JGAAP Website"); + Label lblNewLabel_3 = new Label("\u00A9"+JGAAPConstants.YEAR+" EVL lab"); + lblNewLabel.setMaxWidth(Double.MAX_VALUE); + lblNewLabel.setAlignment(Pos.CENTER); + lblNewLabel_1.setTextFill(Color.color(0,0,1)); + lblNewLabel_2.setTextFill(Color.color(0,0,1)); + Region region1 = new Region(); + Region region2 = new Region(); + Region region3 = new Region(); + Region region4 = new Region(); + Region region5 = new Region(); + Region region6 = new Region(); + Region region7 = new Region(); + Region region8 = new Region(); + lblNewLabel_1.setOnMouseClicked(e -> { + browseToURL("https://www.evllabs.com"); + }); + lblNewLabel_2.setOnMouseClicked(e -> { + browseToURL("https://www.jgaap.com"); + }); + HBox.setHgrow(region1, Priority.ALWAYS); + HBox.setHgrow(region2, Priority.ALWAYS); + HBox.setHgrow(region3, Priority.ALWAYS); + HBox.setHgrow(region4, Priority.ALWAYS); + HBox.setHgrow(region5, Priority.ALWAYS); + HBox.setHgrow(region6, Priority.ALWAYS); + HBox.setHgrow(region7, Priority.ALWAYS); + HBox.setHgrow(region8, Priority.ALWAYS); + Labelbox.getChildren().addAll(region1,lblNewLabel,region2); + linkBox1.getChildren().addAll(region3,lblNewLabel_1,region4); + linkBox2.getChildren().addAll(region5, lblNewLabel_2, region6); + rightsBox.getChildren().addAll(region7, lblNewLabel_3, region8); + box.getChildren().addAll(Labelbox,linkBox1,linkBox2,rightsBox); + return box; + } + + /** + * Method to open a browser to the given URL + * + * @param url String + * @return boolean + */ + public static boolean browseToURL(String url) { + boolean succees = false; + try { + java.awt.Desktop.getDesktop().browse(java.net.URI.create(url)); + succees = true; + } catch (IOException e) { + e.printStackTrace(); + Alert error = new Alert(AlertType.ERROR, e.getMessage()); + error.showAndWait() + .filter(response -> response == ButtonType.OK) + .ifPresent(response -> error.close()); + } + return succees; + } + + /** + * Controls showing or closing (Hiding) the window. + */ + public static void show(){ + if(stage == null){ + build_stage(); + stage.show(); + } else { + stage.show(); + } + } +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_LogWindow.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_LogWindow.java new file mode 100644 index 000000000..92a9c38be --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_LogWindow.java @@ -0,0 +1,86 @@ +package com.jgaap.GUI; + +import javafx.scene.Scene; +import javafx.scene.control.TextArea; +import javafx.scene.layout.Priority; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +import java.io.ByteArrayOutputStream; + +import org.apache.log4j.Logger; +import org.apache.logging.log4j.io.IoBuilder; + + +public class GUI_LogWindow { + + private static Stage stage; + private static TextArea area; + private static Thread printer; + private static Logger logger; + private static ByteArrayOutputStream outputStream; + + public GUI_LogWindow(){ + logger = Logger.getLogger(GUI_LogWindow.class); + outputStream = (ByteArrayOutputStream) IoBuilder + .forLogger((org.apache.logging.log4j.Logger) logger) + .buildOutputStream(); + stage = new Stage(); + area = new TextArea(); + stage.setScene(build_scene()); + stage.setTitle("Log Messages"); + stage.setOnCloseRequest(e -> { + hideStage(); + }); + } + public Scene build_scene(){ + VBox box = new VBox(5); + Scene scene; + area.setEditable(false); + + area.prefHeightProperty().bind(box.prefHeightProperty()); + area.prefWidthProperty().bind(box.prefWidthProperty()); + + printer = new Thread(() -> { + while(!Thread.currentThread().isInterrupted()){ + area.setText(outputStream.toString()); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + logger.info("Thread stopped"); + }); + + VBox.setVgrow(area, Priority.ALWAYS); + box.getChildren().addAll(area); + scene = new Scene(box, 500, 500); + return scene; + } + private void updateWindow(boolean status){ + if(status){ + printer.start(); + } else { + while(printer.isInterrupted()){ + if(!printer.isInterrupted()){ + printer.interrupt(); + try { + printer.join(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + } + + } + public void showStage(){ + updateWindow(true); + stage.show(); + } + public void hideStage(){ + updateWindow(false); + stage.hide(); + } + +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_MainWindow.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_MainWindow.java new file mode 100644 index 000000000..c5c7c45d6 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_MainWindow.java @@ -0,0 +1,240 @@ +package com.jgaap.GUI; +import org.apache.log4j.Logger; + +import com.jgaap.JGAAPConstants; + +import javafx.application.Application; +import javafx.application.Platform; +import javafx.geometry.Insets; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Menu; +import javafx.scene.control.MenuBar; +import javafx.scene.control.MenuItem; +import javafx.scene.control.Tab; +import javafx.scene.control.TabPane; +import javafx.scene.control.Tooltip; +import javafx.scene.image.Image; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +/** + * Main Window Class. + * This Class is the heart of the GUI, and controls the GUI as a whole. It is used to intertwine all the other classes. + * + * @author Edward Polens + */ +public class GUI_MainWindow extends Application{ + + private static Logger logger; + private static BorderPane pane; + private static TabPane tabPane; + + /** + * Used for debugging. + * + * @param args Normal Java Main Args + */ + public static void main(String[] args) { + launch(args); + } + /** + * Main Method for setting up the GUI for JavaFX. + */ + public void start(Stage mainStage) { + logger = Logger.getLogger(GUI_MainWindow.class); + mainStage.setOnCloseRequest(e -> { + e.consume(); + Platform.exit(); + System.exit(0); + }); + mainStage.setTitle(JGAAPConstants.VERSION+" BETA"); + mainStage.getIcons().add(new Image("/ui/jgaap-icon.png")); + mainStage.setScene(init_mainScene(mainStage)); + mainStage.minHeightProperty().set(600); + mainStage.minWidthProperty().set(1000); + mainStage.show(); + } + /** + * Method for constructing the full GUI for JGAAP. + * + * @return Scene + */ + private Scene init_mainScene(Stage stage){ + logger.info("Building Main Window"); + tabPane = new TabPane(); + Scene scene; + VBox docPane, canPane, edPane, ecPane, anPane,reviewPane; + + MenuBar bar = init_MenuBar(stage); + Tab doc = new Tab("Documents"); + Tab canon = new Tab("Canonicizers"); + Tab eve = new Tab("Event Driver"); + Tab evecul = new Tab("Event Culling"); + Tab anMeth = new Tab("Analysis Methods"); + Tab review = new Tab("Review & Process"); + + doc.setId("Documents"); + canon.setId("Canonicizers"); + eve.setId("Event Driver"); + evecul.setId("Event Culling"); + anMeth.setId("Analysis Methods"); + review.setId("Review & Process"); + + doc.setClosable(false); + canon.setClosable(false); + eve.setClosable(false); + evecul.setClosable(false); + anMeth.setClosable(false); + review.setClosable(false); + + pane = new BorderPane(); + + tabPane.prefHeightProperty().bind(pane.heightProperty()); + tabPane.prefWidthProperty().bind(pane.widthProperty()); + GUI_DocTab docTab = new GUI_DocTab(stage); + GUI_CanTab canTab = new GUI_CanTab(); + GUI_EDTab edTab = new GUI_EDTab(); + GUI_ECTab ecTab = new GUI_ECTab(); + GUI_AnalysisTab anTab = new GUI_AnalysisTab(); + GUI_ReviewTab reviewTab = new GUI_ReviewTab(); + + docTab.setBottomButtons(init_bottomButtons()); + canTab.setBottomButtons(init_bottomButtons()); + edTab.setBottomButtons(init_bottomButtons()); + ecTab.setBottomButtons(init_bottomButtons()); + anTab.setBottomButtons(init_bottomButtons()); + + + docPane = docTab.getPane(); + canPane = canTab.getPane(); + edPane = edTab.getPane(); + ecPane = ecTab.getPane(); + anPane = anTab.getPane(); + reviewPane = reviewTab.getPane(); + docPane.setPadding(new Insets(5)); + canPane.setPadding(new Insets(5)); + edPane.setPadding(new Insets(5)); + ecPane.setPadding(new Insets(5)); + anPane.setPadding(new Insets(5)); + reviewPane.setPadding(new Insets(5)); + docPane.prefHeightProperty().bind(tabPane.heightProperty()); + docPane.prefWidthProperty().bind(tabPane.widthProperty()); + canPane.prefHeightProperty().bind(tabPane.heightProperty()); + canPane.prefWidthProperty().bind(tabPane.widthProperty()); + edPane.prefHeightProperty().bind(tabPane.heightProperty()); + edPane.prefWidthProperty().bind(tabPane.widthProperty()); + ecPane.prefHeightProperty().bind(tabPane.heightProperty()); + ecPane.prefWidthProperty().bind(tabPane.widthProperty()); + anPane.prefHeightProperty().bind(tabPane.heightProperty()); + anPane.prefWidthProperty().bind(tabPane.widthProperty()); + reviewPane.prefHeightProperty().bind(tabPane.heightProperty()); + reviewPane.prefWidthProperty().bind(tabPane.widthProperty()); + doc.setContent(docPane); + canon.setContent(canPane); + eve.setContent(edPane); + evecul.setContent(ecPane); + anMeth.setContent(anPane); + review.setContent(reviewPane); + + + tabPane.getTabs().add(doc); + tabPane.getTabs().add(canon); + tabPane.getTabs().add(eve); + tabPane.getTabs().add(evecul); + tabPane.getTabs().add(anMeth); + tabPane.getTabs().add(review); + + tabPane.getSelectionModel().selectedItemProperty().addListener(e -> { + if(tabPane.getSelectionModel().getSelectedItem().getId().equalsIgnoreCase("Review & Process")){ + reviewTab.refreshView(); + } + }); + + + pane.setTop(bar); + pane.setCenter(tabPane); + + scene = new Scene(pane, 1000, 600); + + + return scene; + } + /** + * Builds the Menu Bar and its containing items/functions. + * + * @return MenuBar + */ + private MenuBar init_MenuBar(Stage stage) { + GUI_MenuItemsBatch items = new GUI_MenuItemsBatch(stage); + // GUI_LogWindow log = new GUI_LogWindow(); + MenuBar bar = new MenuBar(); + Menu file = new Menu("File"); + Menu help = new Menu("Help"); + Menu windows = new Menu("Window"); + Menu batch = new Menu("Batch Documents"); + Menu aaac = new Menu("AAAC Problems"); + MenuItem quit = new MenuItem("Quit"); + MenuItem about = new MenuItem("About"); + MenuItem show = new MenuItem("Show Results Window"); + MenuItem console = new MenuItem("Show JGAAP Logging Window"); + + about.setOnAction(e -> { + e.consume(); + GUI_JGAAPAboutWindow.show(); + }); + quit.setOnAction(e -> { + e.consume(); + System.exit(0); + }); + show.setOnAction(e -> { + e.consume(); + GUI_ResultsWindow.showStage(); + }); + console.setOnAction(e -> { + e.consume(); + //log.showStage(); + }); + + aaac.getItems().addAll(items.getProblems()); + batch.getItems().addAll(items.getItems()); + file.getItems().addAll(batch,aaac,quit); + help.getItems().add(about); + windows.getItems().addAll(show,console); + bar.getMenus().add(file); + bar.getMenus().add(windows); + bar.getMenus().add(help); + + return bar; + } + /** + * Builds the bottom buttons that control the TabView in the main window. + + * @return HBox + */ + private HBox init_bottomButtons() { + HBox box = new HBox(5); + Button finish = new Button("Finish & Review"); + Button next = new Button("Next"); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + next.setTooltip(new Tooltip("Go to the next Tab")); + finish.setTooltip(new Tooltip("Go to the Review Tab")); + finish.setOnAction(e -> { + tabPane.getSelectionModel().selectLast(); + e.consume(); + }); + next.setOnAction(e -> { + tabPane.getSelectionModel().selectNext(); + e.consume(); + }); + box.getChildren().add(region1); + box.getChildren().add(finish); + box.getChildren().add(next); + box.setSpacing(10); + return box; + } +} \ No newline at end of file diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_MenuItemsBatch.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_MenuItemsBatch.java new file mode 100644 index 000000000..646f5039a --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_MenuItemsBatch.java @@ -0,0 +1,235 @@ +package com.jgaap.GUI; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + + +import org.apache.log4j.Logger; + +import com.jgaap.JGAAPConstants; +import com.jgaap.backend.API; +import com.jgaap.backend.CSVIO; +import com.jgaap.backend.Utils; +import com.jgaap.util.Document; + +import javafx.scene.control.Alert; +import javafx.scene.control.MenuItem; +import javafx.scene.control.Alert.AlertType; +import javafx.scene.control.ButtonType; +import javafx.stage.FileChooser; +import javafx.stage.FileChooser.ExtensionFilter; +import javafx.stage.Stage; + +/** + * Menu Item Batch Class File. + * This class is used to generate the menu items under File/Help that appear in + * the menu bar. + * + * @author Edward Polens + */ +public class GUI_MenuItemsBatch { + + private static Logger logger; + private static List items; + private static List problems; + private static List docTypes; + private static Stage mainStageRef; + private static API JGAAP_API; + private File filepath; + + /** + * Constructor of the Class + */ + public GUI_MenuItemsBatch(Stage stage) { + items = new ArrayList(); + problems = new ArrayList(); + docTypes = new ArrayList(); + logger = Logger.getLogger(GUI_MenuItemsBatch.class); + JGAAP_API = API.getInstance(); + mainStageRef = stage; + genDocTypes(); + genItems(); + genProblems(); + } + + /** + * Generates the Menu Items for the "File" Menu + */ + private void genItems(){ + MenuItem save = new MenuItem("Save Documents"); + MenuItem load = new MenuItem("Load Documents"); + save.setOnAction(e -> { + ExtensionFilter filter = new ExtensionFilter("Text Documents", docTypes); + FileChooser fileChooser = new FileChooser(); + fileChooser.setTitle("Save Resource File"); + fileChooser.getExtensionFilters().addAll(filter); + try { + List DocumentList = new ArrayList(); + JGAAP_API.loadDocuments(); + DocumentList = JGAAP_API.getDocuments(); + if(DocumentList != null){ + Utils.saveDocumentsToCSV(DocumentList, + fileChooser.showSaveDialog(mainStageRef)); + } + } catch (Exception ex) { + if(this.filepath != null){ + ex.printStackTrace(); + logger.error(ex.getCause(), ex); + Alert error = new Alert(AlertType.ERROR, ex.getMessage()); + error.showAndWait() + .filter(response -> response == ButtonType.OK) + .ifPresent(response -> error.close()); + } + } + e.consume(); + }); + load.setOnAction(e -> { + ExtensionFilter filter = new ExtensionFilter("Text Documents", docTypes); + FileChooser fileChooser = new FileChooser(); + fileChooser.setTitle("Open Resource File"); + fileChooser.getExtensionFilters().addAll(filter); + //if (choice == JFileChooser.APPROVE_OPTION) { + try { + this.filepath = fileChooser.showOpenDialog(mainStageRef); + if(fileChooser != null){ + List> DocumentCSVs = CSVIO.readCSV((InputStream)new FileInputStream(this.filepath)); + for (int i = 0; i < DocumentCSVs.size(); i++) { + JGAAP_API.addDocument(DocumentCSVs.get(i).get(1), + DocumentCSVs.get(i).get(0), (DocumentCSVs.get(i) + .size() > 2 ? DocumentCSVs.get(i).get(2) + : null)); + } + } + GUI_DocTab.updateUnknownDocumentsTable(); + GUI_DocTab.updateAuthorTree(); + }catch (Exception ex) { + if(this.filepath != null){ + logger.error(ex.getCause(), ex); + ex.printStackTrace(); + Alert error = new Alert(AlertType.ERROR, ex.getMessage()); + error.showAndWait() + .filter(response -> response == ButtonType.OK) + .ifPresent(response -> error.close()); + } + } + e.consume(); + }); + items.add(save); + items.add(load); + } + + /** + * Generates the Menu Items for the "AAC Problems" Menu + */ + private void genProblems() { + MenuItem pa = new MenuItem("Problem A"); + MenuItem pb = new MenuItem("Problem B"); + MenuItem pc = new MenuItem("Problem C"); + MenuItem pd = new MenuItem("Problem D"); + MenuItem pe = new MenuItem("Problem E"); + MenuItem pf = new MenuItem("Problem F"); + MenuItem pg = new MenuItem("Problem G"); + MenuItem ph = new MenuItem("Problem H"); + MenuItem pi = new MenuItem("Problem I"); + MenuItem pj = new MenuItem("Problem J"); + MenuItem pk = new MenuItem("Problem K"); + MenuItem pl = new MenuItem("Problem L"); + MenuItem pm = new MenuItem("Problem M"); + ArrayList probList = new ArrayList(); + probList.add("A"); + probList.add("B"); + probList.add("C"); + probList.add("D"); + probList.add("E"); + probList.add("F"); + probList.add("G"); + probList.add("H"); + probList.add("I"); + probList.add("J"); + probList.add("K"); + probList.add("L"); + probList.add("M"); + problems.add(pa); + problems.add(pb); + problems.add(pc); + problems.add(pd); + problems.add(pe); + problems.add(pf); + problems.add(pg); + problems.add(ph); + problems.add(pi); + problems.add(pj); + problems.add(pk); + problems.add(pl); + problems.add(pm); + Iterator iterMenu = problems.iterator(); + Iterator iterString = probList.iterator(); + while (iterMenu.hasNext() && iterString.hasNext()) { + MenuItem item = iterMenu.next(); + item.setOnAction(e -> { + loadAAACProblem(iterString.next()); + }); + } + + } + /** + * Add the document prefix that can be loaded into the program. + */ + private void genDocTypes() { + docTypes.add("*.pdf"); + docTypes.add("*.doc"); + docTypes.add("*.txt"); + docTypes.add("*.html"); + } + /** + * Method for loading the AAAC Problems into JGAAP + * + * @param problem String + */ + private void loadAAACProblem(String problem) { + String filepath; + filepath = JGAAPConstants.JGAAP_RESOURCE_PACKAGE + "aaac/problem" + + problem + "/load" + problem + ".csv"; + List documents = Collections.emptyList(); + try { + documents = Utils.getDocumentsFromCSV(CSVIO + .readCSV(com.jgaap.JGAAP.class + .getResourceAsStream(filepath.toString()))); + } catch (Exception ex) { + ex.printStackTrace(); + Alert error = new Alert(AlertType.ERROR, ex.getMessage()); + error.showAndWait() + .filter(response -> response == ButtonType.OK) + .ifPresent(response -> error.close()); + } + for (Document document : documents) { + JGAAP_API.addDocument(document); + } + GUI_DocTab.updateUnknownDocumentsTable(); + GUI_DocTab.updateAuthorTree(); + GUI_CanTab.UpdateCanonicizerDocTypeComboBox(); + } + + /** + * Getter Function for the "File" Menu Items + * + * @return List + */ + public List getItems() { + return items; + } + + /** + * Getter Function for the "AAAC Problem" Menu Items + * + * @return List + */ + public List getProblems() { + return problems; + } +} \ No newline at end of file diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_NotesWindow.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_NotesWindow.java new file mode 100644 index 000000000..1985a7326 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_NotesWindow.java @@ -0,0 +1,136 @@ +package com.jgaap.GUI; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.TextArea; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +/** + * Notes Window Class. + * This Class creates the Stage for the Notes Window and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_NotesWindow{ + + private static Stage stage; + private static Button notes; + private static TextArea area; + private static String text; + + /** + * Constructor for the class. + */ + public GUI_NotesWindow(){ + stage = new Stage(); + stage.setTitle("Notes"); + stage.hide(); + build_stage(); + stage.setOnCloseRequest(e -> { + area.setText(text); + stage.close(); + e.consume(); + }); + } + /** + * Builds the Window and its elements. + */ + private void build_stage(){ + Scene scene; + VBox box = new VBox(5); + area = new TextArea(); + notes = new Button("Notes"); + notes.setTooltip(new Tooltip("Bring up the Notes Window.")); + text = ""; + + scene = new Scene(box, 600, 600); + + area.prefHeightProperty().bind(scene.heightProperty()); + area.prefWidthProperty().bind(scene.widthProperty()); + notes.setOnAction(e -> { + if(e.getTarget().toString().contains("Notes")){ + if(!stage.isShowing()){ + stage.show(); + e.consume(); + } else { + e.consume(); + } + } + }); + + box.getChildren().addAll(area,init_bottomButtons()); + + + stage.setScene(scene); + } + /** + * Builds the bottom row buttons. + * + * @return HBox + */ + private HBox init_bottomButtons(){ + HBox box = new HBox(5); + Button ok = new Button("OK"); + Button cancel = new Button("Cancel"); + Region region = new Region(); + HBox.setHgrow(region, Priority.ALWAYS); + + ok.setTooltip(new Tooltip("Save Changes.")); + cancel.setTooltip(new Tooltip("Remove changes.")); + ok.setOnAction(e -> { + if(e.getTarget().toString().contains("OK")){ + text = area.getText(); + e.consume(); + } + }); + cancel.setOnAction(e -> { + if(e.getTarget().toString().contains("Cancel")){ + area.setText(text); + stage.hide(); + e.consume(); + } + }); + + box.getChildren().addAll(region,ok,cancel); + + return box; + + } + /** + * Show the Window. + */ + public void show(){ + stage.show(); + } + /** + * Hide the Window. + */ + public void hide(){ + stage.hide(); + } + /** + * Close (hide) the Window. + */ + public void close(){ + stage.close(); + } + /** + * Getter for getting the notes typed in the Text Area. + * + * @return String + */ + public String getNotes(){ + return text; + } + /** + * Getter for getting the "Notes" button for the GUI windows. + * + * @return Button + */ + public Button getButton(){ + return notes; + } +} \ No newline at end of file diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_ResultsWindow.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_ResultsWindow.java new file mode 100644 index 000000000..dbca94862 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_ResultsWindow.java @@ -0,0 +1,138 @@ +package com.jgaap.GUI; + +import javafx.geometry.Insets; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Tab; +import javafx.scene.control.TabPane; +import javafx.scene.control.TextArea; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +import java.util.ArrayList; +import java.util.Calendar; + +import org.apache.log4j.Logger; + +import java.text.SimpleDateFormat; + +/** + * GUI_ResultsWindow class is the class responsible for Building and Managing the window that displays the results. + * + * @author Edward Polens + */ +public class GUI_ResultsWindow { + + private static Stage stage; + private static TabPane tabs; + private static ArrayList resultStorage; + private static Logger logger; + + public static final String DATE_FORMAT_NOW = "yyyy-MM-dd HH:mm:ss"; + + /** + * Constructor for the class. + */ + public GUI_ResultsWindow(){ + logger = Logger.getLogger(GUI_ResultsWindow.class); + resultStorage = new ArrayList(); + stage = new Stage(); + stage.setTitle("Results Window"); + stage.setScene(build_scene()); + + } + /** + * Method builds the Scene for the Stage. + * @return Scene + */ + private Scene build_scene(){ + Scene scene; + VBox box = new VBox(5); + tabs = new TabPane(); + VBox.setVgrow(tabs, Priority.ALWAYS); + tabs.prefHeightProperty().bind(box.prefHeightProperty()); + tabs.prefWidthProperty().bind(box.prefWidthProperty()); + box.getChildren().addAll(tabs); + box.setMinSize(stage.getHeight(), stage.getWidth()); + + scene = new Scene(box, 700, 900); + return scene; + } + /** + * Method builds the clear button at the bottom of the window. + * @return HBox + */ + private HBox init_button(){ + HBox buttonBox = new HBox(5); + Region region1 = new Region(); + Button clear = new Button("Clear"); + HBox.setHgrow(region1, Priority.ALWAYS); + clear.setTooltip(new Tooltip("Remove all results.")); + clear.setOnAction(e -> { + resultStorage.clear(); + tabs.getTabs().clear(); + stage.close(); + e.consume(); + }); + buttonBox.getChildren().addAll(region1,clear); + buttonBox.autosize(); + return buttonBox; + } + /** + * Builds the TabPanel that holds all the child tabs from each result. + * @param results String + */ + public void build_resultTab(String results){ + String now = now(); + VBox box = build_tab(results); + Tab resultTab = new Tab(now); + logger.info("Adding "+now); + resultStorage.add(results); + box.prefHeightProperty().bind(tabs.heightProperty()); + box.prefWidthProperty().bind(tabs.widthProperty()); + box.setPadding(new Insets(5)); + resultTab.setContent(box); + + tabs.getTabs().add(resultTab); + + } + /** + * Builds a new tab for each new experiment ran. + * @param results String + */ + private VBox build_tab(String results){ + TextArea area = new TextArea(); + VBox box = new VBox(5); + area.wrapTextProperty().set(true); + area.setText(results); + area.prefHeightProperty().bind(box.heightProperty()); + area.prefWidthProperty().bind(box.widthProperty()); + box.getChildren().addAll(area, init_button()); + return box; + } + /** + * Gets the current date/time. + * @return String + */ + public static String now(){ + Calendar cal = Calendar.getInstance(); + SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW); + return sdf.format(cal.getTime()); + } + /** + * Show the window. + */ + public static void showStage(){ + stage.show(); + } + /** + * Close (Hide) the Window. + */ + public static void hideStage(){ + stage.hide(); + } + +} diff --git a/jgaap/src/main/java/com/jgaap/GUI/GUI_ReviewTab.java b/jgaap/src/main/java/com/jgaap/GUI/GUI_ReviewTab.java new file mode 100644 index 000000000..019fe8d62 --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/GUI/GUI_ReviewTab.java @@ -0,0 +1,329 @@ +package com.jgaap.GUI; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ListView; +import javafx.scene.control.Tooltip; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.scene.text.Font; +import javafx.scene.text.FontWeight; + +import java.util.Iterator; +import java.util.List; + +import org.apache.log4j.Logger; + +import java.util.ArrayList; + +import com.jgaap.backend.API; +import com.jgaap.generics.AnalysisDriver; +import com.jgaap.generics.EventCuller; +import com.jgaap.generics.EventDriver; +import com.jgaap.util.Document; +import com.jgaap.util.Pair; + + +import com.jgaap.generics.Canonicizer; + +/** + * Review Tab Class. + * This Class creates the scene for the Review Tab and it's GUI elements. + * + * @author Edward Polens + */ +public class GUI_ReviewTab { + + private ListView anList; + private ListView ecList; + private ListView edList; + private ListView canList; + private ObservableList anItems; + private ObservableList ecItems; + private ObservableList edItems; + private ObservableList canItems; + private ArrayList canVals; + private ArrayList ecVals; + private ArrayList edVals; + private ArrayList anVals; + private List> SelectedCanonicizerList; + private GUI_ResultsWindow res; + private VBox box; + private Button process; + private static Logger logger; + private static API JAPI; + + /** + * Constructor for the class. + */ + public GUI_ReviewTab() { + logger = Logger.getLogger(GUI_ReviewTab.class); + this.SelectedCanonicizerList = new ArrayList>(); + this.box = new VBox(); + this.res = new GUI_ResultsWindow(); + GUI_ResultsWindow.hideStage(); + this.SelectedCanonicizerList = new ArrayList>(); + JAPI = API.getInstance(); + } + + /** + * Builds the window row by row. + */ + private void build_pane() { + logger.info("Building Review Tab"); + this.box.getChildren().add(init_firstRow()); + this.box.getChildren().add(init_secondRow()); + this.box.getChildren().add(init_bottomButtons()); + } + + /** + * Builds the 'Tope Row' of GUI elements. + * + * @return VBox + */ + private VBox init_firstRow() { + VBox box = new VBox(5); + Label can = new Label("Canonicizer"); + can.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + box.getChildren().addAll(can, init_canonicizerTable()); + return box; + } + + /** + * Builds the 'Second Row' of GUI elements. + * + * @return HBox + */ + private HBox init_secondRow() { + HBox box = new HBox(5); + VBox edBox = new VBox(); + VBox ecBox = new VBox(); + VBox anBox = new VBox(); + Label ed = new Label("Event Driver"); + Label ec = new Label("Event Culling"); + Label an = new Label("Analysis Method"); + an.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + ed.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + ec.setFont(Font.font("Microsoft Sans Serif", FontWeight.BOLD, 24)); + + edBox.getChildren().addAll(ed, init_eventDriverTable()); + ecBox.getChildren().addAll(ec, init_eventCullingTable()); + anBox.getChildren().addAll(an, init_analysisTable()); + + box.getChildren().addAll(edBox, ecBox, anBox); + return box; + } + + /** + * Builds the 'Common' bottom buttons of the GUI. + * + * @return HBox + */ + private HBox init_bottomButtons() { + HBox box = new HBox(5); + this.process = new Button("Process"); + this.process.setTooltip(new Tooltip("Run the Experiment.")); + Region region1 = new Region(); + HBox.setHgrow(region1, Priority.ALWAYS); + this.process.setOnAction(e -> { + try { + JAPI.clearData(); + JAPI.clearCanonicizers(); + this.SelectedCanonicizerList = GUI_CanTab.getSelectedCanList().values().parallelStream().toList(); + for(Pair canonicizerPair : this.SelectedCanonicizerList){ + if(canonicizerPair.getSecond() instanceof Document.Type){ + JAPI.addCanonicizer(canonicizerPair.getFirst().displayName(), (Document.Type)canonicizerPair.getSecond()); + } else if(canonicizerPair.getSecond() instanceof Document){ + JAPI.addCanonicizer(canonicizerPair.getFirst().displayName(), (Document)canonicizerPair.getSecond()); + } else { + JAPI.addCanonicizer(canonicizerPair.getFirst().displayName()); + } + } + JAPI.execute(); + List documents = JAPI.getDocuments(); + StringBuilder buffer = new StringBuilder(); + for (Document document : documents) { + String result = document.getResult(); + buffer.append(result); + } + this.res.build_resultTab(buffer.toString()); + GUI_ResultsWindow.showStage(); + + } catch (Exception e1) { + logger.error(e1.getCause(), e1); + e1.printStackTrace(); + } + e.consume(); + }); + this.process.setDisable(true); + box.getChildren().add(region1); + box.getChildren().add(process); + return box; + } + + /** + * Method for generating the a list of the selected Canonicizers. + + * @return ListView + */ + private ListView init_canonicizerTable() { + this.canList = new ListView(); + this.canVals = new ArrayList(); + this.canItems = FXCollections.observableArrayList(this.canVals); + this.canList.setItems(this.canItems); + this.canList.prefHeightProperty().bind(this.box.prefHeightProperty()); + this.canList.prefWidthProperty().bind(this.box.prefWidthProperty()); + this.canList.refresh(); + return this.canList; + } + + /** + * Method for generating the Selected Event Driver Table. + * + * @return TableView + */ + private ListView init_eventDriverTable() { + this.edList = new ListView(); + Iterator iter = JAPI.getEventDrivers().iterator(); + this.edVals = new ArrayList(); + while (iter.hasNext()) { + edVals.add(iter.next().displayName()); + } + this.edItems = FXCollections.observableArrayList(this.edVals); + this.edList.setItems(this.edItems); + this.edList.prefHeightProperty().bind(this.box.prefHeightProperty()); + this.edList.prefWidthProperty().bind(this.box.prefWidthProperty()); + this.edList.refresh(); + return this.edList; + } + + /** + * Method for generating the Selected Event Culling Table. + * + * @return TableView + */ + private ListView init_eventCullingTable() { + this.ecList = new ListView(); + Iterator iter = JAPI.getEventCullers().iterator(); + this.ecVals = new ArrayList(); + while (iter.hasNext()) { + ecVals.add(iter.next().displayName()); + } + this.ecItems = FXCollections.observableArrayList(this.ecVals); + this.ecList.setItems(this.ecItems); + this.ecList.prefHeightProperty().bind(this.box.prefHeightProperty()); + this.ecList.prefWidthProperty().bind(this.box.prefWidthProperty()); + this.ecList.refresh(); + return this.ecList; + } + + /** + * Method for generating the Selected Analysis Method Table. + * + * @return TableView + */ + private ListView init_analysisTable() { + this.anList = new ListView(); + Iterator iter = JAPI.getAnalysisDrivers().iterator(); + this.anVals = new ArrayList(); + while (iter.hasNext()) { + anVals.add(iter.next().displayName()); + } + this.anItems = FXCollections.observableArrayList(this.anVals); + this.anList.setItems(this.anItems); + this.anList.prefHeightProperty().bind(this.box.prefHeightProperty()); + this.anList.prefWidthProperty().bind(this.box.prefWidthProperty()); + this.anList.refresh(); + return this.anList; + } + /** + * Method for refreshing the Canonicizer List view + */ + public void refresh_canList() { + Iterator iter = GUI_CanTab.getSelectedCanList().keySet().iterator(); + this.canVals.clear(); + while (iter.hasNext()) { + String item = iter.next(); + this.canVals.add(item); + } + this.canItems = FXCollections.observableArrayList(this.canVals); + this.canList.setItems(this.canItems); + } + /** + * Method for refreshing the Event Driver List view + */ + public void refresh_edList() { + Iterator iter = JAPI.getEventDrivers().iterator(); + this.edVals.clear(); + while (iter.hasNext()) { + edVals.add(iter.next().displayName()); + } + this.edItems = FXCollections.observableArrayList(this.edVals); + this.edList.setItems(this.edItems); + } + /** + * Method for refreshing the Event Culler List view + */ + public void refresh_ecList() { + Iterator iter = JAPI.getEventCullers().iterator(); + this.ecVals.clear(); + while (iter.hasNext()) { + ecVals.add(iter.next().displayName()); + } + this.ecItems = FXCollections.observableArrayList(this.ecVals); + this.ecList.setItems(this.ecItems); + } + /** + * Method for refreshing the Analysis Driver List view + */ + public void refresh_anList() { + Iterator iter = JAPI.getAnalysisDrivers().iterator(); + this.anVals.clear(); + while (iter.hasNext()) { + anVals.add(iter.next().displayName()); + } + this.anItems = FXCollections.observableArrayList(this.anVals); + this.anList.setItems(this.anItems); + } + /** + * Method for refreshing the list views and checking if experiment is setup properly to process. + */ + public void refreshView() { + boolean go = false; + logger.info("Refreshing Review Tab List Views"); + refresh_canList(); + refresh_edList(); + refresh_ecList(); + refresh_anList(); + + this.anList.refresh(); + this.edList.refresh(); + this.ecList.refresh(); + this.canList.refresh(); + + go = (!this.canVals.isEmpty()) ? true : false; + go = (!this.edVals.isEmpty() && go) ? true : false; + + if(go){ + this.process.setDisable(false); + } else { + this.process.setDisable(true); + } + } + + /** + * Getter for getting the built Pane. + * + * @return VBox + */ + public VBox getPane() { + logger.info("Finished Build Review Tab"); + build_pane(); + return this.box; + } +} \ No newline at end of file diff --git a/jgaap/src/main/java/com/jgaap/JGAAP.java b/jgaap/src/main/java/com/jgaap/JGAAP.java new file mode 100644 index 000000000..f5a78eb6a --- /dev/null +++ b/jgaap/src/main/java/com/jgaap/JGAAP.java @@ -0,0 +1,68 @@ +/* + * JGAAP -- a graphical program for stylometric authorship attribution Copyright + * (C) 2009,2011 by Patrick Juola This program is free software: you can + * redistribute it and/or modify it under the terms of the GNU Affero General + * Public License as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Affero General Public License for more + * details. You should have received a copy of the GNU Affero General Public + * License along with this program. If not, see . + */ +/** + **/ +package com.jgaap; + +import javafx.application.Application; + +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; + +import com.jgaap.backend.CLI; + +/** + * The jgaap main file. + * + * @author michael ryan + */ + +public class JGAAP { + + private static Logger logger = Logger.getLogger("com.jgaap"); + private static Logger mainLogger = Logger.getLogger(JGAAP.class); + + public static boolean commandline = false; + + /** + * Launches the jgaap GUI. + */ + private static void createAndShowGUI() { + Application.launch(com.jgaap.GUI.GUI_MainWindow.class, ""); + } + + /** + * launches either the CLI or the GUI based on the command line arguments + * + * @param args the command line arguments + */ + public static void main(String[] args) { + + BasicConfigurator.configure(); + logger.setLevel(Level.INFO); + + if (args.length == 0) { + mainLogger.info("Starting GUI"); + createAndShowGUI(); + + } else { + mainLogger.info("Starting CLI"); + try { + CLI.main(args); + } catch (Exception e) { + mainLogger.fatal("Command Line Failure", e); + } + } + } +} diff --git a/src/com/jgaap/JGAAPConstants.java b/jgaap/src/main/java/com/jgaap/JGAAPConstants.java similarity index 98% rename from src/com/jgaap/JGAAPConstants.java rename to jgaap/src/main/java/com/jgaap/JGAAPConstants.java index 21bf6e703..a3d8a6b20 100644 --- a/src/com/jgaap/JGAAPConstants.java +++ b/jgaap/src/main/java/com/jgaap/JGAAPConstants.java @@ -97,8 +97,8 @@ private static String processPath(String path) { /** * Version Information */ - public static final String VERSION = "8.0.3"; - public static final String YEAR = "2023"; + public static final String VERSION = "9.0.0"; + public static final String YEAR = "2024"; // search table public static HashMap JGAAP_SEARCH_TABLE diff --git a/src/com/jgaap/backend/API.java b/jgaap/src/main/java/com/jgaap/backend/API.java similarity index 100% rename from src/com/jgaap/backend/API.java rename to jgaap/src/main/java/com/jgaap/backend/API.java diff --git a/src/com/jgaap/backend/AnalysisDrivers.java b/jgaap/src/main/java/com/jgaap/backend/AnalysisDrivers.java similarity index 96% rename from src/com/jgaap/backend/AnalysisDrivers.java rename to jgaap/src/main/java/com/jgaap/backend/AnalysisDrivers.java index 7fd03ecd0..2ef78b78f 100644 --- a/src/com/jgaap/backend/AnalysisDrivers.java +++ b/jgaap/src/main/java/com/jgaap/backend/AnalysisDrivers.java @@ -71,7 +71,7 @@ public static AnalysisDriver getAnalysisDriver(String action) throws Exception{ String[] tmp = action.split("\\|", 2); action = tmp[0].trim().toLowerCase(); if(analysisDrivers.containsKey(action)){ - analysisDriver = analysisDrivers.get(action).getClass().newInstance(); + analysisDriver = analysisDrivers.get(action).getClass().getDeclaredConstructor().newInstance(); }else{ throw new Exception("Analysis Driver "+action+" not found!"); } diff --git a/src/com/jgaap/backend/AutoPopulate.java b/jgaap/src/main/java/com/jgaap/backend/AutoPopulate.java similarity index 97% rename from src/com/jgaap/backend/AutoPopulate.java rename to jgaap/src/main/java/com/jgaap/backend/AutoPopulate.java index 874c6ffe0..0a8f75d4a 100644 --- a/src/com/jgaap/backend/AutoPopulate.java +++ b/jgaap/src/main/java/com/jgaap/backend/AutoPopulate.java @@ -61,7 +61,7 @@ public static List findObjects(String packageName, Class superClass) for(Object obj : allClasses) { if(superClass.isAssignableFrom(((Class)obj))){ try { - classes.add(((Class)obj).newInstance()); + classes.add(((Class)obj).getDeclaredConstructor().newInstance()); } catch (Exception e) { logger.warn("Problem instancing object "+obj, e); } diff --git a/src/com/jgaap/backend/CLI.java b/jgaap/src/main/java/com/jgaap/backend/CLI.java similarity index 100% rename from src/com/jgaap/backend/CLI.java rename to jgaap/src/main/java/com/jgaap/backend/CLI.java diff --git a/src/com/jgaap/backend/CSVIO.java b/jgaap/src/main/java/com/jgaap/backend/CSVIO.java similarity index 100% rename from src/com/jgaap/backend/CSVIO.java rename to jgaap/src/main/java/com/jgaap/backend/CSVIO.java diff --git a/src/com/jgaap/backend/Canonicizers.java b/jgaap/src/main/java/com/jgaap/backend/Canonicizers.java similarity index 96% rename from src/com/jgaap/backend/Canonicizers.java rename to jgaap/src/main/java/com/jgaap/backend/Canonicizers.java index 38ef93fea..5f5e70101 100644 --- a/src/com/jgaap/backend/Canonicizers.java +++ b/jgaap/src/main/java/com/jgaap/backend/Canonicizers.java @@ -71,7 +71,7 @@ public static Canonicizer getCanonicizer(String action) throws Exception{ String[] tmp = action.split("\\|", 2); action = tmp[0].trim().toLowerCase(); if(canonicizers.containsKey(action)){ - canonicizer = canonicizers.get(action).getClass().newInstance(); + canonicizer = canonicizers.get(action).getClass().getDeclaredConstructor().newInstance(); }else{ throw new Exception("Canonicizer "+action+" not found!"); } diff --git a/src/com/jgaap/backend/DistanceFunctions.java b/jgaap/src/main/java/com/jgaap/backend/DistanceFunctions.java similarity index 96% rename from src/com/jgaap/backend/DistanceFunctions.java rename to jgaap/src/main/java/com/jgaap/backend/DistanceFunctions.java index dc5e84416..5466b2ad0 100644 --- a/src/com/jgaap/backend/DistanceFunctions.java +++ b/jgaap/src/main/java/com/jgaap/backend/DistanceFunctions.java @@ -72,7 +72,7 @@ public static DistanceFunction getDistanceFunction(String action) throws Excepti String[] tmp = action.split("\\|", 2); action = tmp[0].trim().toLowerCase(); if(distanceFunctions.containsKey(action)){ - distanceFunction= distanceFunctions.get(action).getClass().newInstance(); + distanceFunction= distanceFunctions.get(action).getClass().getDeclaredConstructor().newInstance(); }else{ throw new Exception("Distance Function "+action+" was not found!"); } diff --git a/src/com/jgaap/backend/EventCullers.java b/jgaap/src/main/java/com/jgaap/backend/EventCullers.java similarity index 96% rename from src/com/jgaap/backend/EventCullers.java rename to jgaap/src/main/java/com/jgaap/backend/EventCullers.java index 1bd4bc7ce..476cabe8b 100644 --- a/src/com/jgaap/backend/EventCullers.java +++ b/jgaap/src/main/java/com/jgaap/backend/EventCullers.java @@ -72,7 +72,7 @@ public static EventCuller getEventCuller(String action) throws Exception{ String[] tmp = action.split("\\|", 2); action = tmp[0].trim().toLowerCase(); if(eventCullers.containsKey(action)){ - eventCuller = eventCullers.get(action).getClass().newInstance(); + eventCuller = eventCullers.get(action).getClass().getDeclaredConstructor().newInstance(); }else{ throw new Exception("Event culler "+action+" not found!"); } diff --git a/src/com/jgaap/backend/EventDrivers.java b/jgaap/src/main/java/com/jgaap/backend/EventDrivers.java similarity index 96% rename from src/com/jgaap/backend/EventDrivers.java rename to jgaap/src/main/java/com/jgaap/backend/EventDrivers.java index e29e4ab9d..b13b2cd5c 100644 --- a/src/com/jgaap/backend/EventDrivers.java +++ b/jgaap/src/main/java/com/jgaap/backend/EventDrivers.java @@ -72,7 +72,7 @@ public static EventDriver getEventDriver(String action) throws Exception{ String[] tmp = action.split("\\|", 2); action = tmp[0].trim().toLowerCase(); if(eventDrivers.containsKey(action)){ - eventDriver = eventDrivers.get(action).getClass().newInstance(); + eventDriver = eventDrivers.get(action).getClass().getDeclaredConstructor().newInstance(); }else{ throw new Exception("Event Driver "+action+" not found!"); } diff --git a/src/com/jgaap/backend/ExperimentEngine.java b/jgaap/src/main/java/com/jgaap/backend/ExperimentEngine.java similarity index 100% rename from src/com/jgaap/backend/ExperimentEngine.java rename to jgaap/src/main/java/com/jgaap/backend/ExperimentEngine.java diff --git a/src/com/jgaap/backend/Languages.java b/jgaap/src/main/java/com/jgaap/backend/Languages.java similarity index 96% rename from src/com/jgaap/backend/Languages.java rename to jgaap/src/main/java/com/jgaap/backend/Languages.java index b3a57d834..5637376fa 100644 --- a/src/com/jgaap/backend/Languages.java +++ b/jgaap/src/main/java/com/jgaap/backend/Languages.java @@ -71,7 +71,7 @@ public static Language getLanguage(String action) throws Exception{ Language language; action = action.toLowerCase().trim(); if(languages.containsKey(action)){ - language = languages.get(action).getClass().newInstance(); + language = languages.get(action).getClass().getDeclaredConstructor().newInstance(); }else { throw new Exception("Language "+action+" was not found!"); } diff --git a/src/com/jgaap/backend/Utils.java b/jgaap/src/main/java/com/jgaap/backend/Utils.java similarity index 100% rename from src/com/jgaap/backend/Utils.java rename to jgaap/src/main/java/com/jgaap/backend/Utils.java diff --git a/src/com/jgaap/canonicizers/AddErrors.java b/jgaap/src/main/java/com/jgaap/canonicizers/AddErrors.java similarity index 100% rename from src/com/jgaap/canonicizers/AddErrors.java rename to jgaap/src/main/java/com/jgaap/canonicizers/AddErrors.java diff --git a/src/com/jgaap/canonicizers/IntervieweeText.java b/jgaap/src/main/java/com/jgaap/canonicizers/IntervieweeText.java similarity index 100% rename from src/com/jgaap/canonicizers/IntervieweeText.java rename to jgaap/src/main/java/com/jgaap/canonicizers/IntervieweeText.java diff --git a/src/com/jgaap/canonicizers/NormalizeASCII.java b/jgaap/src/main/java/com/jgaap/canonicizers/NormalizeASCII.java similarity index 100% rename from src/com/jgaap/canonicizers/NormalizeASCII.java rename to jgaap/src/main/java/com/jgaap/canonicizers/NormalizeASCII.java diff --git a/src/com/jgaap/canonicizers/NormalizeWhitespace.java b/jgaap/src/main/java/com/jgaap/canonicizers/NormalizeWhitespace.java similarity index 100% rename from src/com/jgaap/canonicizers/NormalizeWhitespace.java rename to jgaap/src/main/java/com/jgaap/canonicizers/NormalizeWhitespace.java diff --git a/src/com/jgaap/canonicizers/NullCanonicizer.java b/jgaap/src/main/java/com/jgaap/canonicizers/NullCanonicizer.java similarity index 100% rename from src/com/jgaap/canonicizers/NullCanonicizer.java rename to jgaap/src/main/java/com/jgaap/canonicizers/NullCanonicizer.java diff --git a/src/com/jgaap/canonicizers/PunctuationSeparator.java b/jgaap/src/main/java/com/jgaap/canonicizers/PunctuationSeparator.java similarity index 100% rename from src/com/jgaap/canonicizers/PunctuationSeparator.java rename to jgaap/src/main/java/com/jgaap/canonicizers/PunctuationSeparator.java diff --git a/src/com/jgaap/canonicizers/SmashI.java b/jgaap/src/main/java/com/jgaap/canonicizers/SmashI.java similarity index 100% rename from src/com/jgaap/canonicizers/SmashI.java rename to jgaap/src/main/java/com/jgaap/canonicizers/SmashI.java diff --git a/src/com/jgaap/canonicizers/StripComments.java b/jgaap/src/main/java/com/jgaap/canonicizers/StripComments.java similarity index 100% rename from src/com/jgaap/canonicizers/StripComments.java rename to jgaap/src/main/java/com/jgaap/canonicizers/StripComments.java diff --git a/src/com/jgaap/canonicizers/StripNonPunc.java b/jgaap/src/main/java/com/jgaap/canonicizers/StripNonPunc.java similarity index 100% rename from src/com/jgaap/canonicizers/StripNonPunc.java rename to jgaap/src/main/java/com/jgaap/canonicizers/StripNonPunc.java diff --git a/src/com/jgaap/canonicizers/StripNullCharacters.java b/jgaap/src/main/java/com/jgaap/canonicizers/StripNullCharacters.java similarity index 100% rename from src/com/jgaap/canonicizers/StripNullCharacters.java rename to jgaap/src/main/java/com/jgaap/canonicizers/StripNullCharacters.java diff --git a/src/com/jgaap/canonicizers/StripNumbers.java b/jgaap/src/main/java/com/jgaap/canonicizers/StripNumbers.java similarity index 100% rename from src/com/jgaap/canonicizers/StripNumbers.java rename to jgaap/src/main/java/com/jgaap/canonicizers/StripNumbers.java diff --git a/src/com/jgaap/canonicizers/StripPunctuation.java b/jgaap/src/main/java/com/jgaap/canonicizers/StripPunctuation.java similarity index 100% rename from src/com/jgaap/canonicizers/StripPunctuation.java rename to jgaap/src/main/java/com/jgaap/canonicizers/StripPunctuation.java diff --git a/src/com/jgaap/canonicizers/UnifyCase.java b/jgaap/src/main/java/com/jgaap/canonicizers/UnifyCase.java similarity index 100% rename from src/com/jgaap/canonicizers/UnifyCase.java rename to jgaap/src/main/java/com/jgaap/canonicizers/UnifyCase.java diff --git a/src/com/jgaap/classifiers/AbsoluteCentroidDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/AbsoluteCentroidDriver.java similarity index 100% rename from src/com/jgaap/classifiers/AbsoluteCentroidDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/AbsoluteCentroidDriver.java diff --git a/src/com/jgaap/classifiers/BaggingNearestNeighborDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/BaggingNearestNeighborDriver.java similarity index 100% rename from src/com/jgaap/classifiers/BaggingNearestNeighborDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/BaggingNearestNeighborDriver.java diff --git a/src/com/jgaap/classifiers/BurrowsDelta.java b/jgaap/src/main/java/com/jgaap/classifiers/BurrowsDelta.java similarity index 100% rename from src/com/jgaap/classifiers/BurrowsDelta.java rename to jgaap/src/main/java/com/jgaap/classifiers/BurrowsDelta.java diff --git a/src/com/jgaap/classifiers/CentroidDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/CentroidDriver.java similarity index 100% rename from src/com/jgaap/classifiers/CentroidDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/CentroidDriver.java diff --git a/src/com/jgaap/classifiers/KNearestNeighborDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/KNearestNeighborDriver.java similarity index 100% rename from src/com/jgaap/classifiers/KNearestNeighborDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/KNearestNeighborDriver.java diff --git a/src/com/jgaap/classifiers/LDA.java b/jgaap/src/main/java/com/jgaap/classifiers/LDA.java similarity index 100% rename from src/com/jgaap/classifiers/LDA.java rename to jgaap/src/main/java/com/jgaap/classifiers/LDA.java diff --git a/src/com/jgaap/classifiers/LeaveOneOutAbsoluteCentroidDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/LeaveOneOutAbsoluteCentroidDriver.java similarity index 100% rename from src/com/jgaap/classifiers/LeaveOneOutAbsoluteCentroidDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/LeaveOneOutAbsoluteCentroidDriver.java diff --git a/src/com/jgaap/classifiers/LeaveOneOutCentroidDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/LeaveOneOutCentroidDriver.java similarity index 100% rename from src/com/jgaap/classifiers/LeaveOneOutCentroidDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/LeaveOneOutCentroidDriver.java diff --git a/src/com/jgaap/classifiers/LeaveOneOutNoDistanceDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/LeaveOneOutNoDistanceDriver.java similarity index 100% rename from src/com/jgaap/classifiers/LeaveOneOutNoDistanceDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/LeaveOneOutNoDistanceDriver.java diff --git a/src/com/jgaap/classifiers/MahalanobisDistance.java b/jgaap/src/main/java/com/jgaap/classifiers/MahalanobisDistance.java similarity index 100% rename from src/com/jgaap/classifiers/MahalanobisDistance.java rename to jgaap/src/main/java/com/jgaap/classifiers/MahalanobisDistance.java diff --git a/src/com/jgaap/classifiers/MarkovChainAnalysis.java b/jgaap/src/main/java/com/jgaap/classifiers/MarkovChainAnalysis.java similarity index 100% rename from src/com/jgaap/classifiers/MarkovChainAnalysis.java rename to jgaap/src/main/java/com/jgaap/classifiers/MarkovChainAnalysis.java diff --git a/src/com/jgaap/classifiers/NearestNeighborDriver.java b/jgaap/src/main/java/com/jgaap/classifiers/NearestNeighborDriver.java similarity index 100% rename from src/com/jgaap/classifiers/NearestNeighborDriver.java rename to jgaap/src/main/java/com/jgaap/classifiers/NearestNeighborDriver.java diff --git a/src/com/jgaap/classifiers/NullAnalysis.java b/jgaap/src/main/java/com/jgaap/classifiers/NullAnalysis.java similarity index 100% rename from src/com/jgaap/classifiers/NullAnalysis.java rename to jgaap/src/main/java/com/jgaap/classifiers/NullAnalysis.java diff --git a/src/com/jgaap/classifiers/NullHistAnalysis.java b/jgaap/src/main/java/com/jgaap/classifiers/NullHistAnalysis.java similarity index 100% rename from src/com/jgaap/classifiers/NullHistAnalysis.java rename to jgaap/src/main/java/com/jgaap/classifiers/NullHistAnalysis.java diff --git a/src/com/jgaap/classifiers/ThinXent.java b/jgaap/src/main/java/com/jgaap/classifiers/ThinXent.java similarity index 100% rename from src/com/jgaap/classifiers/ThinXent.java rename to jgaap/src/main/java/com/jgaap/classifiers/ThinXent.java diff --git a/src/com/jgaap/classifiers/WEKADecisionStump.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKADecisionStump.java similarity index 100% rename from src/com/jgaap/classifiers/WEKADecisionStump.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKADecisionStump.java diff --git a/src/com/jgaap/classifiers/WEKAJ48DecisionTree.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKAJ48DecisionTree.java similarity index 100% rename from src/com/jgaap/classifiers/WEKAJ48DecisionTree.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKAJ48DecisionTree.java diff --git a/src/com/jgaap/classifiers/WEKALeastMedSq.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKALeastMedSq.java similarity index 100% rename from src/com/jgaap/classifiers/WEKALeastMedSq.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKALeastMedSq.java diff --git a/src/com/jgaap/classifiers/WEKALinearRegression.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKALinearRegression.java similarity index 100% rename from src/com/jgaap/classifiers/WEKALinearRegression.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKALinearRegression.java diff --git a/src/com/jgaap/classifiers/WEKAMultilayerPerceptron.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKAMultilayerPerceptron.java similarity index 100% rename from src/com/jgaap/classifiers/WEKAMultilayerPerceptron.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKAMultilayerPerceptron.java diff --git a/src/com/jgaap/classifiers/WEKANaiveBayes.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKANaiveBayes.java similarity index 100% rename from src/com/jgaap/classifiers/WEKANaiveBayes.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKANaiveBayes.java diff --git a/src/com/jgaap/classifiers/WEKASMO.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKASMO.java similarity index 100% rename from src/com/jgaap/classifiers/WEKASMO.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKASMO.java diff --git a/src/com/jgaap/classifiers/WEKAVotedPerceptron.java b/jgaap/src/main/java/com/jgaap/classifiers/WEKAVotedPerceptron.java similarity index 100% rename from src/com/jgaap/classifiers/WEKAVotedPerceptron.java rename to jgaap/src/main/java/com/jgaap/classifiers/WEKAVotedPerceptron.java diff --git a/src/com/jgaap/classifiers/Xent2.java b/jgaap/src/main/java/com/jgaap/classifiers/Xent2.java similarity index 100% rename from src/com/jgaap/classifiers/Xent2.java rename to jgaap/src/main/java/com/jgaap/classifiers/Xent2.java diff --git a/src/com/jgaap/distances/AltIntersectionDistance.java b/jgaap/src/main/java/com/jgaap/distances/AltIntersectionDistance.java similarity index 100% rename from src/com/jgaap/distances/AltIntersectionDistance.java rename to jgaap/src/main/java/com/jgaap/distances/AltIntersectionDistance.java diff --git a/src/com/jgaap/distances/AngularSeparationDistance.java b/jgaap/src/main/java/com/jgaap/distances/AngularSeparationDistance.java similarity index 100% rename from src/com/jgaap/distances/AngularSeparationDistance.java rename to jgaap/src/main/java/com/jgaap/distances/AngularSeparationDistance.java diff --git a/src/com/jgaap/distances/BhattacharyyaDistance.java b/jgaap/src/main/java/com/jgaap/distances/BhattacharyyaDistance.java similarity index 100% rename from src/com/jgaap/distances/BhattacharyyaDistance.java rename to jgaap/src/main/java/com/jgaap/distances/BhattacharyyaDistance.java diff --git a/src/com/jgaap/distances/BrayCurtisDistance.java b/jgaap/src/main/java/com/jgaap/distances/BrayCurtisDistance.java similarity index 100% rename from src/com/jgaap/distances/BrayCurtisDistance.java rename to jgaap/src/main/java/com/jgaap/distances/BrayCurtisDistance.java diff --git a/src/com/jgaap/distances/CanberraDistance.java b/jgaap/src/main/java/com/jgaap/distances/CanberraDistance.java similarity index 100% rename from src/com/jgaap/distances/CanberraDistance.java rename to jgaap/src/main/java/com/jgaap/distances/CanberraDistance.java diff --git a/src/com/jgaap/distances/ChiSquareDistance.java b/jgaap/src/main/java/com/jgaap/distances/ChiSquareDistance.java similarity index 100% rename from src/com/jgaap/distances/ChiSquareDistance.java rename to jgaap/src/main/java/com/jgaap/distances/ChiSquareDistance.java diff --git a/src/com/jgaap/distances/ChordDistance.java b/jgaap/src/main/java/com/jgaap/distances/ChordDistance.java similarity index 100% rename from src/com/jgaap/distances/ChordDistance.java rename to jgaap/src/main/java/com/jgaap/distances/ChordDistance.java diff --git a/src/com/jgaap/distances/CosineDistance.java b/jgaap/src/main/java/com/jgaap/distances/CosineDistance.java similarity index 100% rename from src/com/jgaap/distances/CosineDistance.java rename to jgaap/src/main/java/com/jgaap/distances/CosineDistance.java diff --git a/src/com/jgaap/distances/CrossEntropyDivergence.java b/jgaap/src/main/java/com/jgaap/distances/CrossEntropyDivergence.java similarity index 100% rename from src/com/jgaap/distances/CrossEntropyDivergence.java rename to jgaap/src/main/java/com/jgaap/distances/CrossEntropyDivergence.java diff --git a/src/com/jgaap/distances/HellingerDistance.java b/jgaap/src/main/java/com/jgaap/distances/HellingerDistance.java similarity index 100% rename from src/com/jgaap/distances/HellingerDistance.java rename to jgaap/src/main/java/com/jgaap/distances/HellingerDistance.java diff --git a/src/com/jgaap/distances/HistogramDistance.java b/jgaap/src/main/java/com/jgaap/distances/HistogramDistance.java similarity index 100% rename from src/com/jgaap/distances/HistogramDistance.java rename to jgaap/src/main/java/com/jgaap/distances/HistogramDistance.java diff --git a/src/com/jgaap/distances/HistogramIntersectionDistance.java b/jgaap/src/main/java/com/jgaap/distances/HistogramIntersectionDistance.java similarity index 100% rename from src/com/jgaap/distances/HistogramIntersectionDistance.java rename to jgaap/src/main/java/com/jgaap/distances/HistogramIntersectionDistance.java diff --git a/src/com/jgaap/distances/IntersectionDistance.java b/jgaap/src/main/java/com/jgaap/distances/IntersectionDistance.java similarity index 100% rename from src/com/jgaap/distances/IntersectionDistance.java rename to jgaap/src/main/java/com/jgaap/distances/IntersectionDistance.java diff --git a/src/com/jgaap/distances/KendallCorrelationDistance.java b/jgaap/src/main/java/com/jgaap/distances/KendallCorrelationDistance.java similarity index 100% rename from src/com/jgaap/distances/KendallCorrelationDistance.java rename to jgaap/src/main/java/com/jgaap/distances/KendallCorrelationDistance.java diff --git a/src/com/jgaap/distances/KendallCorrelationTauBDistance.java b/jgaap/src/main/java/com/jgaap/distances/KendallCorrelationTauBDistance.java similarity index 100% rename from src/com/jgaap/distances/KendallCorrelationTauBDistance.java rename to jgaap/src/main/java/com/jgaap/distances/KendallCorrelationTauBDistance.java diff --git a/src/com/jgaap/distances/KeseljWeightedDistance.java b/jgaap/src/main/java/com/jgaap/distances/KeseljWeightedDistance.java similarity index 100% rename from src/com/jgaap/distances/KeseljWeightedDistance.java rename to jgaap/src/main/java/com/jgaap/distances/KeseljWeightedDistance.java diff --git a/src/com/jgaap/distances/KullbackLeiblerDivergence.java b/jgaap/src/main/java/com/jgaap/distances/KullbackLeiblerDivergence.java similarity index 100% rename from src/com/jgaap/distances/KullbackLeiblerDivergence.java rename to jgaap/src/main/java/com/jgaap/distances/KullbackLeiblerDivergence.java diff --git a/src/com/jgaap/distances/ManhattanDistance.java b/jgaap/src/main/java/com/jgaap/distances/ManhattanDistance.java similarity index 100% rename from src/com/jgaap/distances/ManhattanDistance.java rename to jgaap/src/main/java/com/jgaap/distances/ManhattanDistance.java diff --git a/src/com/jgaap/distances/MatusitaDistance.java b/jgaap/src/main/java/com/jgaap/distances/MatusitaDistance.java similarity index 100% rename from src/com/jgaap/distances/MatusitaDistance.java rename to jgaap/src/main/java/com/jgaap/distances/MatusitaDistance.java diff --git a/src/com/jgaap/distances/NominalKSDistance.java b/jgaap/src/main/java/com/jgaap/distances/NominalKSDistance.java similarity index 100% rename from src/com/jgaap/distances/NominalKSDistance.java rename to jgaap/src/main/java/com/jgaap/distances/NominalKSDistance.java diff --git a/src/com/jgaap/distances/PearsonCorrelationDistance.java b/jgaap/src/main/java/com/jgaap/distances/PearsonCorrelationDistance.java similarity index 100% rename from src/com/jgaap/distances/PearsonCorrelationDistance.java rename to jgaap/src/main/java/com/jgaap/distances/PearsonCorrelationDistance.java diff --git a/src/com/jgaap/distances/SoergleDistance.java b/jgaap/src/main/java/com/jgaap/distances/SoergleDistance.java similarity index 100% rename from src/com/jgaap/distances/SoergleDistance.java rename to jgaap/src/main/java/com/jgaap/distances/SoergleDistance.java diff --git a/src/com/jgaap/distances/StamatatosDistance.java b/jgaap/src/main/java/com/jgaap/distances/StamatatosDistance.java similarity index 100% rename from src/com/jgaap/distances/StamatatosDistance.java rename to jgaap/src/main/java/com/jgaap/distances/StamatatosDistance.java diff --git a/src/com/jgaap/distances/WEDDivergence.java b/jgaap/src/main/java/com/jgaap/distances/WEDDivergence.java similarity index 100% rename from src/com/jgaap/distances/WEDDivergence.java rename to jgaap/src/main/java/com/jgaap/distances/WEDDivergence.java diff --git a/src/com/jgaap/distances/WaveHedgesDistance.java b/jgaap/src/main/java/com/jgaap/distances/WaveHedgesDistance.java similarity index 100% rename from src/com/jgaap/distances/WaveHedgesDistance.java rename to jgaap/src/main/java/com/jgaap/distances/WaveHedgesDistance.java diff --git a/src/com/jgaap/eventCullers/CoefficientOfVariation.java b/jgaap/src/main/java/com/jgaap/eventCullers/CoefficientOfVariation.java similarity index 100% rename from src/com/jgaap/eventCullers/CoefficientOfVariation.java rename to jgaap/src/main/java/com/jgaap/eventCullers/CoefficientOfVariation.java diff --git a/src/com/jgaap/eventCullers/ExtremeCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/ExtremeCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/ExtremeCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/ExtremeCuller.java diff --git a/src/com/jgaap/eventCullers/IQRCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/IQRCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/IQRCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/IQRCuller.java diff --git a/src/com/jgaap/eventCullers/IndexOfDispersion.java b/jgaap/src/main/java/com/jgaap/eventCullers/IndexOfDispersion.java similarity index 100% rename from src/com/jgaap/eventCullers/IndexOfDispersion.java rename to jgaap/src/main/java/com/jgaap/eventCullers/IndexOfDispersion.java diff --git a/src/com/jgaap/eventCullers/InformationGain.java b/jgaap/src/main/java/com/jgaap/eventCullers/InformationGain.java similarity index 100% rename from src/com/jgaap/eventCullers/InformationGain.java rename to jgaap/src/main/java/com/jgaap/eventCullers/InformationGain.java diff --git a/src/com/jgaap/eventCullers/LeastCommonEvents.java b/jgaap/src/main/java/com/jgaap/eventCullers/LeastCommonEvents.java similarity index 100% rename from src/com/jgaap/eventCullers/LeastCommonEvents.java rename to jgaap/src/main/java/com/jgaap/eventCullers/LeastCommonEvents.java diff --git a/src/com/jgaap/eventCullers/MeanAbsoluteDeviation.java b/jgaap/src/main/java/com/jgaap/eventCullers/MeanAbsoluteDeviation.java similarity index 100% rename from src/com/jgaap/eventCullers/MeanAbsoluteDeviation.java rename to jgaap/src/main/java/com/jgaap/eventCullers/MeanAbsoluteDeviation.java diff --git a/src/com/jgaap/eventCullers/MostCommonEvents.java b/jgaap/src/main/java/com/jgaap/eventCullers/MostCommonEvents.java similarity index 100% rename from src/com/jgaap/eventCullers/MostCommonEvents.java rename to jgaap/src/main/java/com/jgaap/eventCullers/MostCommonEvents.java diff --git a/src/com/jgaap/eventCullers/PercentageRangeCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/PercentageRangeCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/PercentageRangeCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/PercentageRangeCuller.java diff --git a/src/com/jgaap/eventCullers/RangeCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/RangeCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/RangeCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/RangeCuller.java diff --git a/src/com/jgaap/eventCullers/SetCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/SetCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/SetCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/SetCuller.java diff --git a/src/com/jgaap/eventCullers/StandardDeviationCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/StandardDeviationCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/StandardDeviationCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/StandardDeviationCuller.java diff --git a/src/com/jgaap/eventCullers/VarianceCuller.java b/jgaap/src/main/java/com/jgaap/eventCullers/VarianceCuller.java similarity index 100% rename from src/com/jgaap/eventCullers/VarianceCuller.java rename to jgaap/src/main/java/com/jgaap/eventCullers/VarianceCuller.java diff --git a/src/com/jgaap/eventCullers/WeightedVariance.java b/jgaap/src/main/java/com/jgaap/eventCullers/WeightedVariance.java similarity index 100% rename from src/com/jgaap/eventCullers/WeightedVariance.java rename to jgaap/src/main/java/com/jgaap/eventCullers/WeightedVariance.java diff --git a/src/com/jgaap/eventDrivers/CharacterEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/CharacterEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/CharacterEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/CharacterEventDriver.java diff --git a/src/com/jgaap/eventDrivers/CharacterNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/CharacterNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/CharacterNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/CharacterNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/CoarsePOSTagger.java b/jgaap/src/main/java/com/jgaap/eventDrivers/CoarsePOSTagger.java similarity index 100% rename from src/com/jgaap/eventDrivers/CoarsePOSTagger.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/CoarsePOSTagger.java diff --git a/src/com/jgaap/eventDrivers/DefinitionsEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/DefinitionsEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/DefinitionsEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/DefinitionsEventDriver.java diff --git a/src/com/jgaap/eventDrivers/FirstWordInSentenceEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/FirstWordInSentenceEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/FirstWordInSentenceEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/FirstWordInSentenceEventDriver.java diff --git a/src/com/jgaap/eventDrivers/FreqEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/FreqEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/FreqEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/FreqEventDriver.java diff --git a/src/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriver.java diff --git a/src/com/jgaap/eventDrivers/KSkipNGramWordEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/KSkipNGramWordEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/KSkipNGramWordEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/KSkipNGramWordEventDriver.java diff --git a/src/com/jgaap/eventDrivers/LeaveKOutCharacterNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/LeaveKOutCharacterNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/LeaveKOutCharacterNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/LeaveKOutCharacterNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/LeaveKOutWordNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/LeaveKOutWordNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/LeaveKOutWordNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/LeaveKOutWordNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/LineLengthEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/LineLengthEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/LineLengthEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/LineLengthEventDriver.java diff --git a/src/com/jgaap/eventDrivers/MNLetterWordEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/MNLetterWordEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/MNLetterWordEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/MNLetterWordEventDriver.java diff --git a/src/com/jgaap/eventDrivers/MWFunctionWordsEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/MWFunctionWordsEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/MWFunctionWordsEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/MWFunctionWordsEventDriver.java diff --git a/src/com/jgaap/eventDrivers/NaiveWordEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/NaiveWordEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/NaiveWordEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/NaiveWordEventDriver.java diff --git a/src/com/jgaap/eventDrivers/NamingTimeEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/NamingTimeEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/NamingTimeEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/NamingTimeEventDriver.java diff --git a/src/com/jgaap/eventDrivers/NewLineEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/NewLineEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/NewLineEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/NewLineEventDriver.java diff --git a/src/com/jgaap/eventDrivers/NullEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/NullEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/NullEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/NullEventDriver.java diff --git a/src/com/jgaap/eventDrivers/POSNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/POSNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/POSNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/POSNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/PartOfSpeechEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/PartOfSpeechEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/PartOfSpeechEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/PartOfSpeechEventDriver.java diff --git a/src/com/jgaap/eventDrivers/PorterStemmerEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/PorterStemmerEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/PorterStemmerEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/PorterStemmerEventDriver.java diff --git a/src/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriver.java diff --git a/src/com/jgaap/eventDrivers/PunctuationEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/PunctuationEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/PunctuationEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/PunctuationEventDriver.java diff --git a/src/com/jgaap/eventDrivers/PunctuationNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/PunctuationNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/PunctuationNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/PunctuationNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/RareWordsEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/RareWordsEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/RareWordsEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/RareWordsEventDriver.java diff --git a/src/com/jgaap/eventDrivers/ReactionTimeEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/ReactionTimeEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/ReactionTimeEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/ReactionTimeEventDriver.java diff --git a/src/com/jgaap/eventDrivers/SentenceEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/SentenceEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/SentenceEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/SentenceEventDriver.java diff --git a/src/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriver.java diff --git a/src/com/jgaap/eventDrivers/SortedCharacterNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/SortedCharacterNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/SortedCharacterNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/SortedCharacterNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/SortedWordNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/SortedWordNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/SortedWordNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/SortedWordNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/StanfordNamedEntityRecognizer.java b/jgaap/src/main/java/com/jgaap/eventDrivers/StanfordNamedEntityRecognizer.java similarity index 100% rename from src/com/jgaap/eventDrivers/StanfordNamedEntityRecognizer.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/StanfordNamedEntityRecognizer.java diff --git a/src/com/jgaap/eventDrivers/StanfordPartOfSpeechEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/StanfordPartOfSpeechEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/StanfordPartOfSpeechEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/StanfordPartOfSpeechEventDriver.java diff --git a/src/com/jgaap/eventDrivers/StanfordPartOfSpeechNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/StanfordPartOfSpeechNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/StanfordPartOfSpeechNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/StanfordPartOfSpeechNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/SuffixEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/SuffixEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/SuffixEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/SuffixEventDriver.java diff --git a/src/com/jgaap/eventDrivers/SyllableTransitionEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/SyllableTransitionEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/SyllableTransitionEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/SyllableTransitionEventDriver.java diff --git a/src/com/jgaap/eventDrivers/TruncatedFreqEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/TruncatedFreqEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/TruncatedFreqEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/TruncatedFreqEventDriver.java diff --git a/src/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriver.java diff --git a/src/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriver.java diff --git a/src/com/jgaap/eventDrivers/VowelInitialWordEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/VowelInitialWordEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/VowelInitialWordEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/VowelInitialWordEventDriver.java diff --git a/src/com/jgaap/eventDrivers/VowelMNLetterWordEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/VowelMNLetterWordEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/VowelMNLetterWordEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/VowelMNLetterWordEventDriver.java diff --git a/src/com/jgaap/eventDrivers/WordLengthEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/WordLengthEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/WordLengthEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/WordLengthEventDriver.java diff --git a/src/com/jgaap/eventDrivers/WordNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/WordNGramEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/WordNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/WordNGramEventDriver.java diff --git a/src/com/jgaap/eventDrivers/WordSyllablesEventDriver.java b/jgaap/src/main/java/com/jgaap/eventDrivers/WordSyllablesEventDriver.java similarity index 100% rename from src/com/jgaap/eventDrivers/WordSyllablesEventDriver.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/WordSyllablesEventDriver.java diff --git a/src/com/jgaap/eventDrivers/WordsBeforeAfterNamedEntities.java b/jgaap/src/main/java/com/jgaap/eventDrivers/WordsBeforeAfterNamedEntities.java similarity index 100% rename from src/com/jgaap/eventDrivers/WordsBeforeAfterNamedEntities.java rename to jgaap/src/main/java/com/jgaap/eventDrivers/WordsBeforeAfterNamedEntities.java diff --git a/src/com/jgaap/generics/AnalysisDriver.java b/jgaap/src/main/java/com/jgaap/generics/AnalysisDriver.java similarity index 100% rename from src/com/jgaap/generics/AnalysisDriver.java rename to jgaap/src/main/java/com/jgaap/generics/AnalysisDriver.java diff --git a/src/com/jgaap/generics/AnalyzeException.java b/jgaap/src/main/java/com/jgaap/generics/AnalyzeException.java similarity index 100% rename from src/com/jgaap/generics/AnalyzeException.java rename to jgaap/src/main/java/com/jgaap/generics/AnalyzeException.java diff --git a/src/com/jgaap/generics/CanonicizationException.java b/jgaap/src/main/java/com/jgaap/generics/CanonicizationException.java similarity index 100% rename from src/com/jgaap/generics/CanonicizationException.java rename to jgaap/src/main/java/com/jgaap/generics/CanonicizationException.java diff --git a/src/com/jgaap/generics/Canonicizer.java b/jgaap/src/main/java/com/jgaap/generics/Canonicizer.java similarity index 100% rename from src/com/jgaap/generics/Canonicizer.java rename to jgaap/src/main/java/com/jgaap/generics/Canonicizer.java diff --git a/src/com/jgaap/generics/Displayable.java b/jgaap/src/main/java/com/jgaap/generics/Displayable.java similarity index 100% rename from src/com/jgaap/generics/Displayable.java rename to jgaap/src/main/java/com/jgaap/generics/Displayable.java diff --git a/src/com/jgaap/generics/DistanceCalculationException.java b/jgaap/src/main/java/com/jgaap/generics/DistanceCalculationException.java similarity index 100% rename from src/com/jgaap/generics/DistanceCalculationException.java rename to jgaap/src/main/java/com/jgaap/generics/DistanceCalculationException.java diff --git a/src/com/jgaap/generics/DistanceFunction.java b/jgaap/src/main/java/com/jgaap/generics/DistanceFunction.java similarity index 100% rename from src/com/jgaap/generics/DistanceFunction.java rename to jgaap/src/main/java/com/jgaap/generics/DistanceFunction.java diff --git a/src/com/jgaap/generics/DivergenceFunction.java b/jgaap/src/main/java/com/jgaap/generics/DivergenceFunction.java similarity index 100% rename from src/com/jgaap/generics/DivergenceFunction.java rename to jgaap/src/main/java/com/jgaap/generics/DivergenceFunction.java diff --git a/src/com/jgaap/generics/EventCuller.java b/jgaap/src/main/java/com/jgaap/generics/EventCuller.java similarity index 100% rename from src/com/jgaap/generics/EventCuller.java rename to jgaap/src/main/java/com/jgaap/generics/EventCuller.java diff --git a/src/com/jgaap/generics/EventCullingException.java b/jgaap/src/main/java/com/jgaap/generics/EventCullingException.java similarity index 100% rename from src/com/jgaap/generics/EventCullingException.java rename to jgaap/src/main/java/com/jgaap/generics/EventCullingException.java diff --git a/src/com/jgaap/generics/EventDriver.java b/jgaap/src/main/java/com/jgaap/generics/EventDriver.java similarity index 100% rename from src/com/jgaap/generics/EventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/EventDriver.java diff --git a/src/com/jgaap/generics/EventGenerationException.java b/jgaap/src/main/java/com/jgaap/generics/EventGenerationException.java similarity index 100% rename from src/com/jgaap/generics/EventGenerationException.java rename to jgaap/src/main/java/com/jgaap/generics/EventGenerationException.java diff --git a/src/com/jgaap/generics/FilterEventCuller.java b/jgaap/src/main/java/com/jgaap/generics/FilterEventCuller.java similarity index 100% rename from src/com/jgaap/generics/FilterEventCuller.java rename to jgaap/src/main/java/com/jgaap/generics/FilterEventCuller.java diff --git a/src/com/jgaap/generics/KSkipNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/KSkipNGramEventDriver.java similarity index 100% rename from src/com/jgaap/generics/KSkipNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/KSkipNGramEventDriver.java diff --git a/src/com/jgaap/generics/Language.java b/jgaap/src/main/java/com/jgaap/generics/Language.java similarity index 100% rename from src/com/jgaap/generics/Language.java rename to jgaap/src/main/java/com/jgaap/generics/Language.java diff --git a/src/com/jgaap/generics/LanguageParsingException.java b/jgaap/src/main/java/com/jgaap/generics/LanguageParsingException.java similarity index 100% rename from src/com/jgaap/generics/LanguageParsingException.java rename to jgaap/src/main/java/com/jgaap/generics/LanguageParsingException.java diff --git a/src/com/jgaap/generics/LeaveKOutNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/LeaveKOutNGramEventDriver.java similarity index 100% rename from src/com/jgaap/generics/LeaveKOutNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/LeaveKOutNGramEventDriver.java diff --git a/src/com/jgaap/generics/NGramEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/NGramEventDriver.java similarity index 100% rename from src/com/jgaap/generics/NGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/NGramEventDriver.java diff --git a/src/com/jgaap/generics/NeighborAnalysisDriver.java b/jgaap/src/main/java/com/jgaap/generics/NeighborAnalysisDriver.java similarity index 100% rename from src/com/jgaap/generics/NeighborAnalysisDriver.java rename to jgaap/src/main/java/com/jgaap/generics/NeighborAnalysisDriver.java diff --git a/src/com/jgaap/generics/NonDistanceDependentAnalysisDriver.java b/jgaap/src/main/java/com/jgaap/generics/NonDistanceDependentAnalysisDriver.java similarity index 95% rename from src/com/jgaap/generics/NonDistanceDependentAnalysisDriver.java rename to jgaap/src/main/java/com/jgaap/generics/NonDistanceDependentAnalysisDriver.java index 8319056dc..ec89c2198 100644 --- a/src/com/jgaap/generics/NonDistanceDependentAnalysisDriver.java +++ b/jgaap/src/main/java/com/jgaap/generics/NonDistanceDependentAnalysisDriver.java @@ -18,6 +18,7 @@ public void setAnalysisDriver(AnalysisDriver analysisDriver) { // for this driver, and analysisDriver as the dependency for this // driver. setParamGUI(analysisDriver.getParamGUI()); + setParamNewGUI(analysisDriver.getNewParamGUI()); this.analysisDriver = analysisDriver; } diff --git a/src/com/jgaap/generics/NumericEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/NumericEventDriver.java similarity index 100% rename from src/com/jgaap/generics/NumericEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/NumericEventDriver.java diff --git a/src/com/jgaap/generics/NumericTransformationEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/NumericTransformationEventDriver.java similarity index 100% rename from src/com/jgaap/generics/NumericTransformationEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/NumericTransformationEventDriver.java diff --git a/src/com/jgaap/generics/Parameterizable.java b/jgaap/src/main/java/com/jgaap/generics/Parameterizable.java similarity index 79% rename from src/com/jgaap/generics/Parameterizable.java rename to jgaap/src/main/java/com/jgaap/generics/Parameterizable.java index 490294951..db6c57304 100644 --- a/src/com/jgaap/generics/Parameterizable.java +++ b/jgaap/src/main/java/com/jgaap/generics/Parameterizable.java @@ -26,10 +26,19 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.Arrays; import javax.swing.GroupLayout; import javax.swing.JComboBox; import javax.swing.JLabel; + +import javafx.collections.FXCollections; +import javafx.scene.control.ComboBox; +import javafx.scene.control.Label; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; + import javax.swing.JPanel; import com.jgaap.util.Pair; @@ -48,18 +57,22 @@ public class Parameterizable { /** Store parameter GUI settings representations (label, dropdown box pair) */ private List> paramGUI; + + /** Store parameter GUI settings representations (label, dropdown box pair) */ + private List> newParamGUI; /** Construct new Parameterizable with empty set */ public Parameterizable() { Parameters = new HashMap(); paramGUI = new ArrayList>(); + newParamGUI = new ArrayList>(); } private Parameterizable(Map parameters) { Parameters = parameters; paramGUI = Collections.emptyList(); + newParamGUI = Collections.emptyList(); } - /** Removes all label and their associated values */ public void clearParameterSet() { Parameters.clear(); @@ -236,12 +249,16 @@ public void setParameters(Parameterizable parameterizable) { public void addParams(String paramName, String displayName, String defaultValue, String[] possibleValues, boolean editable) { JLabel label = new JLabel(); JComboBox box = new JComboBox(); + Label fxLabel = new Label(); + ComboBox fxBox = new ComboBox(); setParameter(paramName, defaultValue); label.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); label.setText(displayName); + fxLabel.setText(displayName); + box.setModel(new javax.swing.DefaultComboBoxModel(possibleValues)); box.setEditable(editable); box.setName(paramName); @@ -252,7 +269,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { } }); + fxBox.setItems(FXCollections.observableList(Arrays.asList(possibleValues))); + fxBox.setEditable(editable); + fxBox.setId(paramName); + fxBox.getSelectionModel().select(defaultValue); + fxBox.setOnAction(e -> { + changeParam(e); + }); + paramGUI.add(new Pair(label, box)); + newParamGUI.add(new Pair(fxLabel,fxBox)); } public GroupLayout getGUILayout(JPanel panel){ @@ -280,12 +306,35 @@ public GroupLayout getGUILayout(JPanel panel){ return layout; } + public VBox getNewGUILayout(){ + + VBox box = new VBox(5); + Region region1 = new Region(); + Region region2 = new Region(); + VBox.setVgrow(region1, Priority.ALWAYS); + VBox.setVgrow(region2, Priority.ALWAYS); + + box.getChildren().add(region1); + for(Pair p : newParamGUI) { + box.getChildren().add(p.getFirst()); + box.getChildren().add(p.getSecond()); + } + box.getChildren().add(region2); + box.setStyle("-fx-border-color: black"); + return box; + } protected void changeParam(java.awt.event.ActionEvent evt) { for(Pair p : paramGUI) { this.setParameter(p.getSecond().getName(), (String)p.getSecond().getSelectedItem()); } } + protected void changeParam(javafx.event.ActionEvent evt) { + for(Pair p : newParamGUI) { + this.setParameter(p.getSecond().getId(), (String)p.getSecond().getSelectionModel().getSelectedItem()); + } + evt.consume(); + } /** * Return the List that makes the parameter GUI. This @@ -297,6 +346,9 @@ protected void changeParam(java.awt.event.ActionEvent evt) { public List> getParamGUI() { return paramGUI; } + public List> getNewParamGUI() { + return newParamGUI; + } /** * Sets parameters based on the parameter GUI list that is passed in. @@ -322,4 +374,21 @@ public void setParamGUI(List> incomingParamGUI) { addParams(paramName, displayName, defaultValue, possibleValues, editable); } } + public void setParamNewGUI(List> incomingParamGUI){ + for(Pair guiPair : incomingParamGUI){ + Label label = guiPair.getFirst(); + ComboBox box = guiPair.getSecond(); + String paramName = box.getId(); + String displayName = label.getText(); + String defaultValue = String.valueOf(box.getSelectionModel().getSelectedItem()); + String[] possibleValues = new String[box.getItems().size()]; + boolean editable = box.isEditable(); + + for(int x = 0; x < possibleValues.length; x++){ + possibleValues[x] = String.valueOf(box.getItems().get(x)); + } + + addParams(paramName, displayName, defaultValue, possibleValues, editable); + } + } } diff --git a/src/com/jgaap/generics/SortedNGramEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/SortedNGramEventDriver.java similarity index 100% rename from src/com/jgaap/generics/SortedNGramEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/SortedNGramEventDriver.java diff --git a/src/com/jgaap/generics/TruncatedEventDriver.java b/jgaap/src/main/java/com/jgaap/generics/TruncatedEventDriver.java similarity index 100% rename from src/com/jgaap/generics/TruncatedEventDriver.java rename to jgaap/src/main/java/com/jgaap/generics/TruncatedEventDriver.java diff --git a/src/com/jgaap/generics/ValidationDriver.java b/jgaap/src/main/java/com/jgaap/generics/ValidationDriver.java similarity index 100% rename from src/com/jgaap/generics/ValidationDriver.java rename to jgaap/src/main/java/com/jgaap/generics/ValidationDriver.java diff --git a/src/com/jgaap/generics/WEKAAnalysisDriver.java b/jgaap/src/main/java/com/jgaap/generics/WEKAAnalysisDriver.java similarity index 100% rename from src/com/jgaap/generics/WEKAAnalysisDriver.java rename to jgaap/src/main/java/com/jgaap/generics/WEKAAnalysisDriver.java diff --git a/src/com/jgaap/languages/Arabic.java b/jgaap/src/main/java/com/jgaap/languages/Arabic.java similarity index 100% rename from src/com/jgaap/languages/Arabic.java rename to jgaap/src/main/java/com/jgaap/languages/Arabic.java diff --git a/src/com/jgaap/languages/Chinese.java b/jgaap/src/main/java/com/jgaap/languages/Chinese.java similarity index 100% rename from src/com/jgaap/languages/Chinese.java rename to jgaap/src/main/java/com/jgaap/languages/Chinese.java diff --git a/src/com/jgaap/languages/ChineseBMM.java b/jgaap/src/main/java/com/jgaap/languages/ChineseBMM.java similarity index 100% rename from src/com/jgaap/languages/ChineseBMM.java rename to jgaap/src/main/java/com/jgaap/languages/ChineseBMM.java diff --git a/src/com/jgaap/languages/ChineseFMM.java b/jgaap/src/main/java/com/jgaap/languages/ChineseFMM.java similarity index 100% rename from src/com/jgaap/languages/ChineseFMM.java rename to jgaap/src/main/java/com/jgaap/languages/ChineseFMM.java diff --git a/src/com/jgaap/languages/ChineseJointMM.java b/jgaap/src/main/java/com/jgaap/languages/ChineseJointMM.java similarity index 100% rename from src/com/jgaap/languages/ChineseJointMM.java rename to jgaap/src/main/java/com/jgaap/languages/ChineseJointMM.java diff --git a/src/com/jgaap/languages/ComputerLanguage.java b/jgaap/src/main/java/com/jgaap/languages/ComputerLanguage.java similarity index 100% rename from src/com/jgaap/languages/ComputerLanguage.java rename to jgaap/src/main/java/com/jgaap/languages/ComputerLanguage.java diff --git a/src/com/jgaap/languages/English.java b/jgaap/src/main/java/com/jgaap/languages/English.java similarity index 100% rename from src/com/jgaap/languages/English.java rename to jgaap/src/main/java/com/jgaap/languages/English.java diff --git a/src/com/jgaap/languages/EnglishUTF16.java b/jgaap/src/main/java/com/jgaap/languages/EnglishUTF16.java similarity index 100% rename from src/com/jgaap/languages/EnglishUTF16.java rename to jgaap/src/main/java/com/jgaap/languages/EnglishUTF16.java diff --git a/src/com/jgaap/languages/EnglishUTF8.java b/jgaap/src/main/java/com/jgaap/languages/EnglishUTF8.java similarity index 100% rename from src/com/jgaap/languages/EnglishUTF8.java rename to jgaap/src/main/java/com/jgaap/languages/EnglishUTF8.java diff --git a/src/com/jgaap/languages/Generic.java b/jgaap/src/main/java/com/jgaap/languages/Generic.java similarity index 100% rename from src/com/jgaap/languages/Generic.java rename to jgaap/src/main/java/com/jgaap/languages/Generic.java diff --git a/src/com/jgaap/languages/Greek.java b/jgaap/src/main/java/com/jgaap/languages/Greek.java similarity index 100% rename from src/com/jgaap/languages/Greek.java rename to jgaap/src/main/java/com/jgaap/languages/Greek.java diff --git a/src/com/jgaap/languages/Russian.java b/jgaap/src/main/java/com/jgaap/languages/Russian.java similarity index 100% rename from src/com/jgaap/languages/Russian.java rename to jgaap/src/main/java/com/jgaap/languages/Russian.java diff --git a/src/com/jgaap/ui/JGAAP_UI_AboutDialog.java b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_AboutDialog.java similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_AboutDialog.java rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_AboutDialog.java diff --git a/src/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.form b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.form similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.form rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.form diff --git a/src/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.java b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.java similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.java rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_AddAuthorDialog.java diff --git a/src/com/jgaap/ui/JGAAP_UI_MainForm.form b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_MainForm.form similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_MainForm.form rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_MainForm.form diff --git a/src/com/jgaap/ui/JGAAP_UI_MainForm.java b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_MainForm.java similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_MainForm.java rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_MainForm.java diff --git a/src/com/jgaap/ui/JGAAP_UI_NotesDialog.form b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_NotesDialog.form similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_NotesDialog.form rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_NotesDialog.form diff --git a/src/com/jgaap/ui/JGAAP_UI_NotesDialog.java b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_NotesDialog.java similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_NotesDialog.java rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_NotesDialog.java diff --git a/src/com/jgaap/ui/JGAAP_UI_ResultsDialog.form b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_ResultsDialog.form similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_ResultsDialog.form rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_ResultsDialog.form diff --git a/src/com/jgaap/ui/JGAAP_UI_ResultsDialog.java b/jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_ResultsDialog.java similarity index 100% rename from src/com/jgaap/ui/JGAAP_UI_ResultsDialog.java rename to jgaap/src/main/java/com/jgaap/ui/JGAAP_UI_ResultsDialog.java diff --git a/src/com/jgaap/util/AbsoluteHistogram.java b/jgaap/src/main/java/com/jgaap/util/AbsoluteHistogram.java similarity index 100% rename from src/com/jgaap/util/AbsoluteHistogram.java rename to jgaap/src/main/java/com/jgaap/util/AbsoluteHistogram.java diff --git a/src/com/jgaap/util/Ballot.java b/jgaap/src/main/java/com/jgaap/util/Ballot.java similarity index 100% rename from src/com/jgaap/util/Ballot.java rename to jgaap/src/main/java/com/jgaap/util/Ballot.java diff --git a/src/com/jgaap/util/Document.java b/jgaap/src/main/java/com/jgaap/util/Document.java similarity index 100% rename from src/com/jgaap/util/Document.java rename to jgaap/src/main/java/com/jgaap/util/Document.java diff --git a/src/com/jgaap/util/DocumentHelper.java b/jgaap/src/main/java/com/jgaap/util/DocumentHelper.java similarity index 97% rename from src/com/jgaap/util/DocumentHelper.java rename to jgaap/src/main/java/com/jgaap/util/DocumentHelper.java index 7eb1a0e20..d428c8b04 100644 --- a/src/com/jgaap/util/DocumentHelper.java +++ b/jgaap/src/main/java/com/jgaap/util/DocumentHelper.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.URI; import java.net.URL; import org.apache.log4j.Logger; @@ -83,7 +84,8 @@ static private String replaceCRLF(String text) { static private InputStream getInputStream(String filepath) throws Exception{ InputStream is; if (filepath.startsWith("http://") || filepath.startsWith("https://")) { - URL url = new URL(filepath); + URI uri = new URI(filepath); + URL url = uri.toURL(); is = url.openStream(); } else if (filepath.startsWith("/com/jgaap/resources")){ is = com.jgaap.JGAAP.class.getResourceAsStream(filepath); diff --git a/src/com/jgaap/util/Event.java b/jgaap/src/main/java/com/jgaap/util/Event.java similarity index 100% rename from src/com/jgaap/util/Event.java rename to jgaap/src/main/java/com/jgaap/util/Event.java diff --git a/src/com/jgaap/util/EventBagging.java b/jgaap/src/main/java/com/jgaap/util/EventBagging.java similarity index 100% rename from src/com/jgaap/util/EventBagging.java rename to jgaap/src/main/java/com/jgaap/util/EventBagging.java diff --git a/src/com/jgaap/util/EventGraph.java b/jgaap/src/main/java/com/jgaap/util/EventGraph.java similarity index 100% rename from src/com/jgaap/util/EventGraph.java rename to jgaap/src/main/java/com/jgaap/util/EventGraph.java diff --git a/src/com/jgaap/util/EventHistogram.java b/jgaap/src/main/java/com/jgaap/util/EventHistogram.java similarity index 100% rename from src/com/jgaap/util/EventHistogram.java rename to jgaap/src/main/java/com/jgaap/util/EventHistogram.java diff --git a/src/com/jgaap/util/EventMap.java b/jgaap/src/main/java/com/jgaap/util/EventMap.java similarity index 100% rename from src/com/jgaap/util/EventMap.java rename to jgaap/src/main/java/com/jgaap/util/EventMap.java diff --git a/src/com/jgaap/util/EventSet.java b/jgaap/src/main/java/com/jgaap/util/EventSet.java similarity index 100% rename from src/com/jgaap/util/EventSet.java rename to jgaap/src/main/java/com/jgaap/util/EventSet.java diff --git a/src/com/jgaap/util/EventTrie.java b/jgaap/src/main/java/com/jgaap/util/EventTrie.java similarity index 100% rename from src/com/jgaap/util/EventTrie.java rename to jgaap/src/main/java/com/jgaap/util/EventTrie.java diff --git a/src/com/jgaap/util/FeatureVectorFactory.java b/jgaap/src/main/java/com/jgaap/util/FeatureVectorFactory.java similarity index 100% rename from src/com/jgaap/util/FeatureVectorFactory.java rename to jgaap/src/main/java/com/jgaap/util/FeatureVectorFactory.java diff --git a/src/com/jgaap/util/Histogram.java b/jgaap/src/main/java/com/jgaap/util/Histogram.java similarity index 100% rename from src/com/jgaap/util/Histogram.java rename to jgaap/src/main/java/com/jgaap/util/Histogram.java diff --git a/src/com/jgaap/util/Instance.java b/jgaap/src/main/java/com/jgaap/util/Instance.java similarity index 100% rename from src/com/jgaap/util/Instance.java rename to jgaap/src/main/java/com/jgaap/util/Instance.java diff --git a/src/com/jgaap/util/NumericEventSet.java b/jgaap/src/main/java/com/jgaap/util/NumericEventSet.java similarity index 100% rename from src/com/jgaap/util/NumericEventSet.java rename to jgaap/src/main/java/com/jgaap/util/NumericEventSet.java diff --git a/src/com/jgaap/util/Pair.java b/jgaap/src/main/java/com/jgaap/util/Pair.java similarity index 100% rename from src/com/jgaap/util/Pair.java rename to jgaap/src/main/java/com/jgaap/util/Pair.java diff --git a/src/com/jgaap/resources/ELPfreq.dat b/jgaap/src/main/resources/ELPfreq.dat similarity index 100% rename from src/com/jgaap/resources/ELPfreq.dat rename to jgaap/src/main/resources/ELPfreq.dat diff --git a/src/com/jgaap/resources/ELPnaming.dat b/jgaap/src/main/resources/ELPnaming.dat similarity index 100% rename from src/com/jgaap/resources/ELPnaming.dat rename to jgaap/src/main/resources/ELPnaming.dat diff --git a/src/com/jgaap/resources/ELPrt.dat b/jgaap/src/main/resources/ELPrt.dat similarity index 100% rename from src/com/jgaap/resources/ELPrt.dat rename to jgaap/src/main/resources/ELPrt.dat diff --git a/src/com/jgaap/resources/MWfunctionwords.dat b/jgaap/src/main/resources/MWfunctionwords.dat similarity index 100% rename from src/com/jgaap/resources/MWfunctionwords.dat rename to jgaap/src/main/resources/MWfunctionwords.dat diff --git a/src/com/jgaap/resources/aaac/problemA/Asample01.txt b/jgaap/src/main/resources/aaac/problemA/Asample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample01.txt rename to jgaap/src/main/resources/aaac/problemA/Asample01.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample02.txt b/jgaap/src/main/resources/aaac/problemA/Asample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample02.txt rename to jgaap/src/main/resources/aaac/problemA/Asample02.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample03.txt b/jgaap/src/main/resources/aaac/problemA/Asample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample03.txt rename to jgaap/src/main/resources/aaac/problemA/Asample03.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample04.txt b/jgaap/src/main/resources/aaac/problemA/Asample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample04.txt rename to jgaap/src/main/resources/aaac/problemA/Asample04.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample05.txt b/jgaap/src/main/resources/aaac/problemA/Asample05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample05.txt rename to jgaap/src/main/resources/aaac/problemA/Asample05.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample06.txt b/jgaap/src/main/resources/aaac/problemA/Asample06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample06.txt rename to jgaap/src/main/resources/aaac/problemA/Asample06.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample07.txt b/jgaap/src/main/resources/aaac/problemA/Asample07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample07.txt rename to jgaap/src/main/resources/aaac/problemA/Asample07.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample08.txt b/jgaap/src/main/resources/aaac/problemA/Asample08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample08.txt rename to jgaap/src/main/resources/aaac/problemA/Asample08.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample09.txt b/jgaap/src/main/resources/aaac/problemA/Asample09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample09.txt rename to jgaap/src/main/resources/aaac/problemA/Asample09.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample10.txt b/jgaap/src/main/resources/aaac/problemA/Asample10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample10.txt rename to jgaap/src/main/resources/aaac/problemA/Asample10.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample11.txt b/jgaap/src/main/resources/aaac/problemA/Asample11.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample11.txt rename to jgaap/src/main/resources/aaac/problemA/Asample11.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample12.txt b/jgaap/src/main/resources/aaac/problemA/Asample12.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample12.txt rename to jgaap/src/main/resources/aaac/problemA/Asample12.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Asample13.txt b/jgaap/src/main/resources/aaac/problemA/Asample13.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Asample13.txt rename to jgaap/src/main/resources/aaac/problemA/Asample13.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain01-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain01-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain01-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain01-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain01-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain01-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain01-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain01-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain01-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain01-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain01-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain01-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain02-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain02-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain02-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain02-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain02-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain02-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain02-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain02-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain03-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain03-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain03-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain03-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain03-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain03-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain03-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain03-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain03-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain03-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain03-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain03-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain04-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain04-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain04-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain04-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain04-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain04-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain04-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain04-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain04-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain04-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain04-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain04-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain05-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain05-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain05-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain05-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain05-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain05-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain05-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain05-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain05-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain05-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain05-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain05-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain06-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain06-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain06-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain06-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain06-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain06-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain06-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain06-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain06-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain06-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain06-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain06-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain07-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain07-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain07-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain07-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain07-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain07-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain07-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain07-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain07-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain07-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain07-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain07-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain08-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain08-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain08-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain08-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain08-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain08-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain08-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain08-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain08-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain08-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain08-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain08-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain09-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain09-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain09-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain09-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain09-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain09-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain09-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain09-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain09-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain09-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain09-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain09-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain10-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain10-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain10-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain10-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain10-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain10-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain10-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain10-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain10-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain10-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain10-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain10-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain11-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain11-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain11-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain11-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain11-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain11-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain11-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain11-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain11-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain11-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain11-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain11-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain12-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain12-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain12-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain12-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain12-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain12-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain12-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain12-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain12-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain12-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain12-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain12-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain13-1.txt b/jgaap/src/main/resources/aaac/problemA/Atrain13-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain13-1.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain13-1.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain13-2.txt b/jgaap/src/main/resources/aaac/problemA/Atrain13-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain13-2.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain13-2.txt diff --git a/src/com/jgaap/resources/aaac/problemA/Atrain13-3.txt b/jgaap/src/main/resources/aaac/problemA/Atrain13-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/Atrain13-3.txt rename to jgaap/src/main/resources/aaac/problemA/Atrain13-3.txt diff --git a/src/com/jgaap/resources/aaac/problemA/loadA.csv b/jgaap/src/main/resources/aaac/problemA/loadA.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemA/loadA.csv rename to jgaap/src/main/resources/aaac/problemA/loadA.csv diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample01.txt b/jgaap/src/main/resources/aaac/problemB/Bsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample01.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample02.txt b/jgaap/src/main/resources/aaac/problemB/Bsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample02.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample03.txt b/jgaap/src/main/resources/aaac/problemB/Bsample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample03.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample03.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample04.txt b/jgaap/src/main/resources/aaac/problemB/Bsample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample04.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample04.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample05.txt b/jgaap/src/main/resources/aaac/problemB/Bsample05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample05.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample05.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample06.txt b/jgaap/src/main/resources/aaac/problemB/Bsample06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample06.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample06.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample07.txt b/jgaap/src/main/resources/aaac/problemB/Bsample07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample07.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample07.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample08.txt b/jgaap/src/main/resources/aaac/problemB/Bsample08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample08.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample08.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample09.txt b/jgaap/src/main/resources/aaac/problemB/Bsample09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample09.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample09.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample10.txt b/jgaap/src/main/resources/aaac/problemB/Bsample10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample10.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample10.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample11.txt b/jgaap/src/main/resources/aaac/problemB/Bsample11.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample11.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample11.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample12.txt b/jgaap/src/main/resources/aaac/problemB/Bsample12.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample12.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample12.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Bsample13.txt b/jgaap/src/main/resources/aaac/problemB/Bsample13.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Bsample13.txt rename to jgaap/src/main/resources/aaac/problemB/Bsample13.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain01-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain01-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain01-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain01-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain01-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain01-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain01-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain01-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain01-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain01-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain01-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain01-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain02-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain02-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain02-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain02-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain02-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain02-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain02-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain02-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain03-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain03-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain03-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain03-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain03-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain03-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain03-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain03-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain03-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain03-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain03-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain03-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain04-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain04-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain04-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain04-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain04-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain04-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain04-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain04-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain04-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain04-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain04-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain04-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain05-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain05-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain05-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain05-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain05-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain05-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain05-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain05-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain05-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain05-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain05-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain05-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain06-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain06-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain06-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain06-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain06-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain06-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain06-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain06-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain06-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain06-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain06-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain06-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain07-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain07-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain07-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain07-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain07-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain07-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain07-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain07-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain07-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain07-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain07-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain07-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain08-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain08-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain08-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain08-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain08-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain08-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain08-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain08-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain08-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain08-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain08-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain08-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain09-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain09-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain09-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain09-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain09-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain09-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain09-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain09-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain09-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain09-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain09-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain09-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain10-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain10-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain10-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain10-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain10-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain10-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain10-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain10-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain10-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain10-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain10-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain10-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain11-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain11-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain11-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain11-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain11-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain11-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain11-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain11-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain11-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain11-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain11-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain11-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain12-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain12-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain12-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain12-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain12-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain12-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain12-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain12-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain12-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain12-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain12-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain12-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain13-1.txt b/jgaap/src/main/resources/aaac/problemB/Btrain13-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain13-1.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain13-1.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain13-2.txt b/jgaap/src/main/resources/aaac/problemB/Btrain13-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain13-2.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain13-2.txt diff --git a/src/com/jgaap/resources/aaac/problemB/Btrain13-3.txt b/jgaap/src/main/resources/aaac/problemB/Btrain13-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/Btrain13-3.txt rename to jgaap/src/main/resources/aaac/problemB/Btrain13-3.txt diff --git a/src/com/jgaap/resources/aaac/problemB/loadB.csv b/jgaap/src/main/resources/aaac/problemB/loadB.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemB/loadB.csv rename to jgaap/src/main/resources/aaac/problemB/loadB.csv diff --git a/src/com/jgaap/resources/aaac/problemC/Csample01.txt b/jgaap/src/main/resources/aaac/problemC/Csample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample01.txt rename to jgaap/src/main/resources/aaac/problemC/Csample01.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample02.txt b/jgaap/src/main/resources/aaac/problemC/Csample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample02.txt rename to jgaap/src/main/resources/aaac/problemC/Csample02.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample03.txt b/jgaap/src/main/resources/aaac/problemC/Csample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample03.txt rename to jgaap/src/main/resources/aaac/problemC/Csample03.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample04.txt b/jgaap/src/main/resources/aaac/problemC/Csample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample04.txt rename to jgaap/src/main/resources/aaac/problemC/Csample04.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample05.txt b/jgaap/src/main/resources/aaac/problemC/Csample05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample05.txt rename to jgaap/src/main/resources/aaac/problemC/Csample05.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample06.txt b/jgaap/src/main/resources/aaac/problemC/Csample06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample06.txt rename to jgaap/src/main/resources/aaac/problemC/Csample06.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample07.txt b/jgaap/src/main/resources/aaac/problemC/Csample07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample07.txt rename to jgaap/src/main/resources/aaac/problemC/Csample07.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample08.txt b/jgaap/src/main/resources/aaac/problemC/Csample08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample08.txt rename to jgaap/src/main/resources/aaac/problemC/Csample08.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Csample09.txt b/jgaap/src/main/resources/aaac/problemC/Csample09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Csample09.txt rename to jgaap/src/main/resources/aaac/problemC/Csample09.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain01-1.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain01-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain01-1.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain01-1.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain01-2.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain01-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain01-2.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain01-2.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain01-3.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain01-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain01-3.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain01-3.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain01-4.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain01-4.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain01-4.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain01-4.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain02-1.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain02-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain02-1.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain02-1.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain02-2.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain02-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain02-2.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain02-2.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain02-3.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain02-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain02-3.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain02-3.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain02-4.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain02-4.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain02-4.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain02-4.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain03-1.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain03-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain03-1.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain03-1.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain03-2.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain03-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain03-2.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain03-2.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain03-3.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain03-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain03-3.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain03-3.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain04-1.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain04-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain04-1.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain04-1.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain04-2.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain04-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain04-2.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain04-2.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain04-3.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain04-3.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain04-3.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain04-3.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain04-4.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain04-4.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain04-4.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain04-4.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain05-1.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain05-1.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain05-1.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain05-1.txt diff --git a/src/com/jgaap/resources/aaac/problemC/Ctrain05-2.txt b/jgaap/src/main/resources/aaac/problemC/Ctrain05-2.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/Ctrain05-2.txt rename to jgaap/src/main/resources/aaac/problemC/Ctrain05-2.txt diff --git a/src/com/jgaap/resources/aaac/problemC/loadC.csv b/jgaap/src/main/resources/aaac/problemC/loadC.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemC/loadC.csv rename to jgaap/src/main/resources/aaac/problemC/loadC.csv diff --git a/src/com/jgaap/resources/aaac/problemD/Dsample01.txt b/jgaap/src/main/resources/aaac/problemD/Dsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dsample01.txt rename to jgaap/src/main/resources/aaac/problemD/Dsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dsample02.txt b/jgaap/src/main/resources/aaac/problemD/Dsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dsample02.txt rename to jgaap/src/main/resources/aaac/problemD/Dsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dsample03.txt b/jgaap/src/main/resources/aaac/problemD/Dsample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dsample03.txt rename to jgaap/src/main/resources/aaac/problemD/Dsample03.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dsample04.txt b/jgaap/src/main/resources/aaac/problemD/Dsample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dsample04.txt rename to jgaap/src/main/resources/aaac/problemD/Dsample04.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain01-01.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain01-01.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain01-02.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain01-02.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain01-03.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain01-03.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain01-04.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain01-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain01-04.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain01-04.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain01-05.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain01-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain01-05.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain01-05.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain02-01.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain02-01.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain02-02.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain02-02.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain02-03.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain02-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain02-03.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain02-03.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain03-01.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain03-01.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain03-02.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain03-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain03-02.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain03-02.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain03-03.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain03-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain03-03.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain03-03.txt diff --git a/src/com/jgaap/resources/aaac/problemD/Dtrain03-04.txt b/jgaap/src/main/resources/aaac/problemD/Dtrain03-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/Dtrain03-04.txt rename to jgaap/src/main/resources/aaac/problemD/Dtrain03-04.txt diff --git a/src/com/jgaap/resources/aaac/problemD/loadD.csv b/jgaap/src/main/resources/aaac/problemD/loadD.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemD/loadD.csv rename to jgaap/src/main/resources/aaac/problemD/loadD.csv diff --git a/src/com/jgaap/resources/aaac/problemE/Esample01.txt b/jgaap/src/main/resources/aaac/problemE/Esample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Esample01.txt rename to jgaap/src/main/resources/aaac/problemE/Esample01.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Esample02.txt b/jgaap/src/main/resources/aaac/problemE/Esample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Esample02.txt rename to jgaap/src/main/resources/aaac/problemE/Esample02.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Esample03.txt b/jgaap/src/main/resources/aaac/problemE/Esample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Esample03.txt rename to jgaap/src/main/resources/aaac/problemE/Esample03.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Esample04.txt b/jgaap/src/main/resources/aaac/problemE/Esample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Esample04.txt rename to jgaap/src/main/resources/aaac/problemE/Esample04.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain01-01.txt b/jgaap/src/main/resources/aaac/problemE/Etrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain01-01.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain01-02.txt b/jgaap/src/main/resources/aaac/problemE/Etrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain01-02.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain01-03.txt b/jgaap/src/main/resources/aaac/problemE/Etrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain01-03.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain01-04.txt b/jgaap/src/main/resources/aaac/problemE/Etrain01-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain01-04.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain01-04.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain01-05.txt b/jgaap/src/main/resources/aaac/problemE/Etrain01-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain01-05.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain01-05.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain02-01.txt b/jgaap/src/main/resources/aaac/problemE/Etrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain02-01.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain02-02.txt b/jgaap/src/main/resources/aaac/problemE/Etrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain02-02.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain02-03.txt b/jgaap/src/main/resources/aaac/problemE/Etrain02-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain02-03.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain02-03.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain03-01.txt b/jgaap/src/main/resources/aaac/problemE/Etrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain03-01.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain03-02.txt b/jgaap/src/main/resources/aaac/problemE/Etrain03-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain03-02.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain03-02.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain03-03.txt b/jgaap/src/main/resources/aaac/problemE/Etrain03-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain03-03.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain03-03.txt diff --git a/src/com/jgaap/resources/aaac/problemE/Etrain03-04.txt b/jgaap/src/main/resources/aaac/problemE/Etrain03-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/Etrain03-04.txt rename to jgaap/src/main/resources/aaac/problemE/Etrain03-04.txt diff --git a/src/com/jgaap/resources/aaac/problemE/loadE.csv b/jgaap/src/main/resources/aaac/problemE/loadE.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemE/loadE.csv rename to jgaap/src/main/resources/aaac/problemE/loadE.csv diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample01.txt b/jgaap/src/main/resources/aaac/problemF/Fsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample01.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample02.txt b/jgaap/src/main/resources/aaac/problemF/Fsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample02.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample03.txt b/jgaap/src/main/resources/aaac/problemF/Fsample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample03.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample03.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample04.txt b/jgaap/src/main/resources/aaac/problemF/Fsample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample04.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample04.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample05.txt b/jgaap/src/main/resources/aaac/problemF/Fsample05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample05.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample05.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample06.txt b/jgaap/src/main/resources/aaac/problemF/Fsample06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample06.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample06.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample07.txt b/jgaap/src/main/resources/aaac/problemF/Fsample07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample07.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample07.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample08.txt b/jgaap/src/main/resources/aaac/problemF/Fsample08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample08.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample08.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample09.txt b/jgaap/src/main/resources/aaac/problemF/Fsample09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample09.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample09.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Fsample10.txt b/jgaap/src/main/resources/aaac/problemF/Fsample10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Fsample10.txt rename to jgaap/src/main/resources/aaac/problemF/Fsample10.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-01.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-01.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-02.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-02.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-03.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-03.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-04.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-04.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-04.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-05.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-05.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-05.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-06.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-06.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-06.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-07.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-07.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-07.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-08.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-08.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-08.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-09.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-09.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-09.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-10.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-10.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-10.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-11.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-11.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-11.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-11.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-12.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-12.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-12.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-12.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-13.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-13.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-13.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-13.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-14.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-14.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-14.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-14.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-15.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-15.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-15.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-15.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-16.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-16.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-16.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-16.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-17.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-17.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-17.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-17.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-18.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-18.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-18.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-18.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-19.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-19.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-19.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-19.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain01-20.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain01-20.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain01-20.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain01-20.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-01.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-01.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-02.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-02.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-03.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-03.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-03.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-04.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-04.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-04.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-05.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-05.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-05.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-06.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-06.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-06.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-07.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-07.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-07.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-08.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-08.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-08.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-09.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-09.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-09.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-10.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-10.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-10.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-11.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-11.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-11.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-11.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-12.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-12.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-12.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-12.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-13.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-13.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-13.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-13.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-14.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-14.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-14.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-14.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-15.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-15.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-15.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-15.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-16.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-16.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-16.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-16.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-17.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-17.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-17.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-17.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-18.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-18.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-18.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-18.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-19.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-19.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-19.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-19.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain02-20.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain02-20.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain02-20.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain02-20.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-01.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-01.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-02.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-02.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-02.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-03.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-03.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-03.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-04.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-04.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-04.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-05.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-05.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-05.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-06.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-06.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-06.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-07.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-07.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-07.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-08.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-08.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-08.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-09.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-09.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-09.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-10.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-10.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-10.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-11.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-11.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-11.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-11.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-12.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-12.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-12.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-12.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-13.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-13.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-13.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-13.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-14.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-14.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-14.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-14.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-15.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-15.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-15.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-15.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-16.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-16.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-16.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-16.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-17.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-17.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-17.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-17.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-18.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-18.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-18.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-18.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-19.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-19.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-19.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-19.txt diff --git a/src/com/jgaap/resources/aaac/problemF/Ftrain03-20.txt b/jgaap/src/main/resources/aaac/problemF/Ftrain03-20.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/Ftrain03-20.txt rename to jgaap/src/main/resources/aaac/problemF/Ftrain03-20.txt diff --git a/src/com/jgaap/resources/aaac/problemF/loadF.csv b/jgaap/src/main/resources/aaac/problemF/loadF.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemF/loadF.csv rename to jgaap/src/main/resources/aaac/problemF/loadF.csv diff --git a/src/com/jgaap/resources/aaac/problemG/Gsample01.txt b/jgaap/src/main/resources/aaac/problemG/Gsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gsample01.txt rename to jgaap/src/main/resources/aaac/problemG/Gsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gsample02.txt b/jgaap/src/main/resources/aaac/problemG/Gsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gsample02.txt rename to jgaap/src/main/resources/aaac/problemG/Gsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gsample03.txt b/jgaap/src/main/resources/aaac/problemG/Gsample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gsample03.txt rename to jgaap/src/main/resources/aaac/problemG/Gsample03.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gsample04.txt b/jgaap/src/main/resources/aaac/problemG/Gsample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gsample04.txt rename to jgaap/src/main/resources/aaac/problemG/Gsample04.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gtrain01-01.txt b/jgaap/src/main/resources/aaac/problemG/Gtrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gtrain01-01.txt rename to jgaap/src/main/resources/aaac/problemG/Gtrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gtrain01-02.txt b/jgaap/src/main/resources/aaac/problemG/Gtrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gtrain01-02.txt rename to jgaap/src/main/resources/aaac/problemG/Gtrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gtrain01-03.txt b/jgaap/src/main/resources/aaac/problemG/Gtrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gtrain01-03.txt rename to jgaap/src/main/resources/aaac/problemG/Gtrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gtrain02-01.txt b/jgaap/src/main/resources/aaac/problemG/Gtrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gtrain02-01.txt rename to jgaap/src/main/resources/aaac/problemG/Gtrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gtrain02-02.txt b/jgaap/src/main/resources/aaac/problemG/Gtrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gtrain02-02.txt rename to jgaap/src/main/resources/aaac/problemG/Gtrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemG/Gtrain02-03.txt b/jgaap/src/main/resources/aaac/problemG/Gtrain02-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/Gtrain02-03.txt rename to jgaap/src/main/resources/aaac/problemG/Gtrain02-03.txt diff --git a/src/com/jgaap/resources/aaac/problemG/loadG.csv b/jgaap/src/main/resources/aaac/problemG/loadG.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemG/loadG.csv rename to jgaap/src/main/resources/aaac/problemG/loadG.csv diff --git a/src/com/jgaap/resources/aaac/problemH/Hsample01.txt b/jgaap/src/main/resources/aaac/problemH/Hsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/Hsample01.txt rename to jgaap/src/main/resources/aaac/problemH/Hsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemH/Hsample02.txt b/jgaap/src/main/resources/aaac/problemH/Hsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/Hsample02.txt rename to jgaap/src/main/resources/aaac/problemH/Hsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemH/Hsample03.txt b/jgaap/src/main/resources/aaac/problemH/Hsample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/Hsample03.txt rename to jgaap/src/main/resources/aaac/problemH/Hsample03.txt diff --git a/src/com/jgaap/resources/aaac/problemH/Htrain01-01.txt b/jgaap/src/main/resources/aaac/problemH/Htrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/Htrain01-01.txt rename to jgaap/src/main/resources/aaac/problemH/Htrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemH/Htrain02-01.txt b/jgaap/src/main/resources/aaac/problemH/Htrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/Htrain02-01.txt rename to jgaap/src/main/resources/aaac/problemH/Htrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemH/Htrain03-01.txt b/jgaap/src/main/resources/aaac/problemH/Htrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/Htrain03-01.txt rename to jgaap/src/main/resources/aaac/problemH/Htrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemH/loadH.csv b/jgaap/src/main/resources/aaac/problemH/loadH.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemH/loadH.csv rename to jgaap/src/main/resources/aaac/problemH/loadH.csv diff --git a/src/com/jgaap/resources/aaac/problemI/Isample01.txt b/jgaap/src/main/resources/aaac/problemI/Isample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Isample01.txt rename to jgaap/src/main/resources/aaac/problemI/Isample01.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Isample02.txt b/jgaap/src/main/resources/aaac/problemI/Isample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Isample02.txt rename to jgaap/src/main/resources/aaac/problemI/Isample02.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Isample03.txt b/jgaap/src/main/resources/aaac/problemI/Isample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Isample03.txt rename to jgaap/src/main/resources/aaac/problemI/Isample03.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Isample04.txt b/jgaap/src/main/resources/aaac/problemI/Isample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Isample04.txt rename to jgaap/src/main/resources/aaac/problemI/Isample04.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Itrain01-01.txt b/jgaap/src/main/resources/aaac/problemI/Itrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Itrain01-01.txt rename to jgaap/src/main/resources/aaac/problemI/Itrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Itrain01-02.txt b/jgaap/src/main/resources/aaac/problemI/Itrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Itrain01-02.txt rename to jgaap/src/main/resources/aaac/problemI/Itrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Itrain01-03.txt b/jgaap/src/main/resources/aaac/problemI/Itrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Itrain01-03.txt rename to jgaap/src/main/resources/aaac/problemI/Itrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Itrain02-01.txt b/jgaap/src/main/resources/aaac/problemI/Itrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Itrain02-01.txt rename to jgaap/src/main/resources/aaac/problemI/Itrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemI/Itrain02-02.txt b/jgaap/src/main/resources/aaac/problemI/Itrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/Itrain02-02.txt rename to jgaap/src/main/resources/aaac/problemI/Itrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemI/loadI.csv b/jgaap/src/main/resources/aaac/problemI/loadI.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemI/loadI.csv rename to jgaap/src/main/resources/aaac/problemI/loadI.csv diff --git a/src/com/jgaap/resources/aaac/problemJ/Jsample01.txt b/jgaap/src/main/resources/aaac/problemJ/Jsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jsample01.txt rename to jgaap/src/main/resources/aaac/problemJ/Jsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/Jsample02.txt b/jgaap/src/main/resources/aaac/problemJ/Jsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jsample02.txt rename to jgaap/src/main/resources/aaac/problemJ/Jsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/Jtrain01-01.txt b/jgaap/src/main/resources/aaac/problemJ/Jtrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jtrain01-01.txt rename to jgaap/src/main/resources/aaac/problemJ/Jtrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/Jtrain01-02.txt b/jgaap/src/main/resources/aaac/problemJ/Jtrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jtrain01-02.txt rename to jgaap/src/main/resources/aaac/problemJ/Jtrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/Jtrain01-03.txt b/jgaap/src/main/resources/aaac/problemJ/Jtrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jtrain01-03.txt rename to jgaap/src/main/resources/aaac/problemJ/Jtrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/Jtrain02-01.txt b/jgaap/src/main/resources/aaac/problemJ/Jtrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jtrain02-01.txt rename to jgaap/src/main/resources/aaac/problemJ/Jtrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/Jtrain02-02.txt b/jgaap/src/main/resources/aaac/problemJ/Jtrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/Jtrain02-02.txt rename to jgaap/src/main/resources/aaac/problemJ/Jtrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemJ/loadJ.csv b/jgaap/src/main/resources/aaac/problemJ/loadJ.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemJ/loadJ.csv rename to jgaap/src/main/resources/aaac/problemJ/loadJ.csv diff --git a/src/com/jgaap/resources/aaac/problemK/Ksample01.txt b/jgaap/src/main/resources/aaac/problemK/Ksample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ksample01.txt rename to jgaap/src/main/resources/aaac/problemK/Ksample01.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ksample02.txt b/jgaap/src/main/resources/aaac/problemK/Ksample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ksample02.txt rename to jgaap/src/main/resources/aaac/problemK/Ksample02.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ksample03.txt b/jgaap/src/main/resources/aaac/problemK/Ksample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ksample03.txt rename to jgaap/src/main/resources/aaac/problemK/Ksample03.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ksample04.txt b/jgaap/src/main/resources/aaac/problemK/Ksample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ksample04.txt rename to jgaap/src/main/resources/aaac/problemK/Ksample04.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain01-01.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain01-01.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain01-02.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain01-02.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain01-03.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain01-03.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain01-04.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain01-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain01-04.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain01-04.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain02-01.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain02-01.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain02-02.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain02-02.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-01.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-01.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-02.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-02.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-02.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-03.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-03.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-03.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-04.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-04.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-04.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-05.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-05.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-05.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-06.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-06.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-06.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-07.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-07.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-07.txt diff --git a/src/com/jgaap/resources/aaac/problemK/Ktrain03-08.txt b/jgaap/src/main/resources/aaac/problemK/Ktrain03-08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/Ktrain03-08.txt rename to jgaap/src/main/resources/aaac/problemK/Ktrain03-08.txt diff --git a/src/com/jgaap/resources/aaac/problemK/loadK.csv b/jgaap/src/main/resources/aaac/problemK/loadK.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemK/loadK.csv rename to jgaap/src/main/resources/aaac/problemK/loadK.csv diff --git a/src/com/jgaap/resources/aaac/problemL/Lsample01.txt b/jgaap/src/main/resources/aaac/problemL/Lsample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Lsample01.txt rename to jgaap/src/main/resources/aaac/problemL/Lsample01.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Lsample02.txt b/jgaap/src/main/resources/aaac/problemL/Lsample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Lsample02.txt rename to jgaap/src/main/resources/aaac/problemL/Lsample02.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Lsample03.txt b/jgaap/src/main/resources/aaac/problemL/Lsample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Lsample03.txt rename to jgaap/src/main/resources/aaac/problemL/Lsample03.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Lsample04.txt b/jgaap/src/main/resources/aaac/problemL/Lsample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Lsample04.txt rename to jgaap/src/main/resources/aaac/problemL/Lsample04.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Ltrain01-01.txt b/jgaap/src/main/resources/aaac/problemL/Ltrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Ltrain01-01.txt rename to jgaap/src/main/resources/aaac/problemL/Ltrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Ltrain01-02.txt b/jgaap/src/main/resources/aaac/problemL/Ltrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Ltrain01-02.txt rename to jgaap/src/main/resources/aaac/problemL/Ltrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Ltrain02-01.txt b/jgaap/src/main/resources/aaac/problemL/Ltrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Ltrain02-01.txt rename to jgaap/src/main/resources/aaac/problemL/Ltrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Ltrain02-02.txt b/jgaap/src/main/resources/aaac/problemL/Ltrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Ltrain02-02.txt rename to jgaap/src/main/resources/aaac/problemL/Ltrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Ltrain03-01.txt b/jgaap/src/main/resources/aaac/problemL/Ltrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Ltrain03-01.txt rename to jgaap/src/main/resources/aaac/problemL/Ltrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemL/Ltrain04-01.txt b/jgaap/src/main/resources/aaac/problemL/Ltrain04-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/Ltrain04-01.txt rename to jgaap/src/main/resources/aaac/problemL/Ltrain04-01.txt diff --git a/src/com/jgaap/resources/aaac/problemL/loadL.csv b/jgaap/src/main/resources/aaac/problemL/loadL.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemL/loadL.csv rename to jgaap/src/main/resources/aaac/problemL/loadL.csv diff --git a/src/com/jgaap/resources/aaac/problemM/Msample01.txt b/jgaap/src/main/resources/aaac/problemM/Msample01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample01.txt rename to jgaap/src/main/resources/aaac/problemM/Msample01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample02.txt b/jgaap/src/main/resources/aaac/problemM/Msample02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample02.txt rename to jgaap/src/main/resources/aaac/problemM/Msample02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample03.txt b/jgaap/src/main/resources/aaac/problemM/Msample03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample03.txt rename to jgaap/src/main/resources/aaac/problemM/Msample03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample04.txt b/jgaap/src/main/resources/aaac/problemM/Msample04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample04.txt rename to jgaap/src/main/resources/aaac/problemM/Msample04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample05.txt b/jgaap/src/main/resources/aaac/problemM/Msample05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample05.txt rename to jgaap/src/main/resources/aaac/problemM/Msample05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample06.txt b/jgaap/src/main/resources/aaac/problemM/Msample06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample06.txt rename to jgaap/src/main/resources/aaac/problemM/Msample06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample07.txt b/jgaap/src/main/resources/aaac/problemM/Msample07.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample07.txt rename to jgaap/src/main/resources/aaac/problemM/Msample07.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample08.txt b/jgaap/src/main/resources/aaac/problemM/Msample08.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample08.txt rename to jgaap/src/main/resources/aaac/problemM/Msample08.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample09.txt b/jgaap/src/main/resources/aaac/problemM/Msample09.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample09.txt rename to jgaap/src/main/resources/aaac/problemM/Msample09.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample10.txt b/jgaap/src/main/resources/aaac/problemM/Msample10.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample10.txt rename to jgaap/src/main/resources/aaac/problemM/Msample10.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample11.txt b/jgaap/src/main/resources/aaac/problemM/Msample11.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample11.txt rename to jgaap/src/main/resources/aaac/problemM/Msample11.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample12.txt b/jgaap/src/main/resources/aaac/problemM/Msample12.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample12.txt rename to jgaap/src/main/resources/aaac/problemM/Msample12.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample13.txt b/jgaap/src/main/resources/aaac/problemM/Msample13.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample13.txt rename to jgaap/src/main/resources/aaac/problemM/Msample13.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample14.txt b/jgaap/src/main/resources/aaac/problemM/Msample14.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample14.txt rename to jgaap/src/main/resources/aaac/problemM/Msample14.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample15.txt b/jgaap/src/main/resources/aaac/problemM/Msample15.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample15.txt rename to jgaap/src/main/resources/aaac/problemM/Msample15.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample16.txt b/jgaap/src/main/resources/aaac/problemM/Msample16.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample16.txt rename to jgaap/src/main/resources/aaac/problemM/Msample16.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample17.txt b/jgaap/src/main/resources/aaac/problemM/Msample17.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample17.txt rename to jgaap/src/main/resources/aaac/problemM/Msample17.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample18.txt b/jgaap/src/main/resources/aaac/problemM/Msample18.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample18.txt rename to jgaap/src/main/resources/aaac/problemM/Msample18.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample19.txt b/jgaap/src/main/resources/aaac/problemM/Msample19.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample19.txt rename to jgaap/src/main/resources/aaac/problemM/Msample19.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample20.txt b/jgaap/src/main/resources/aaac/problemM/Msample20.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample20.txt rename to jgaap/src/main/resources/aaac/problemM/Msample20.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample21.txt b/jgaap/src/main/resources/aaac/problemM/Msample21.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample21.txt rename to jgaap/src/main/resources/aaac/problemM/Msample21.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample22.txt b/jgaap/src/main/resources/aaac/problemM/Msample22.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample22.txt rename to jgaap/src/main/resources/aaac/problemM/Msample22.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample23.txt b/jgaap/src/main/resources/aaac/problemM/Msample23.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample23.txt rename to jgaap/src/main/resources/aaac/problemM/Msample23.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Msample24.txt b/jgaap/src/main/resources/aaac/problemM/Msample24.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Msample24.txt rename to jgaap/src/main/resources/aaac/problemM/Msample24.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain01-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain01-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain01-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain01-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain01-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain01-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain01-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain01-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain01-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain01-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain01-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain01-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain01-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain01-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain01-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain01-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain01-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain01-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain01-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain01-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain01-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain01-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain01-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain01-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain02-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain02-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain02-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain02-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain02-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain02-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain02-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain02-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain02-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain02-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain02-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain02-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain02-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain02-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain02-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain02-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain02-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain02-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain02-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain02-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain02-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain02-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain02-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain02-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain03-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain03-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain03-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain03-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain03-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain03-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain03-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain03-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain03-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain03-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain03-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain03-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain03-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain03-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain03-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain03-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain03-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain03-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain03-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain03-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain03-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain03-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain03-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain03-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain04-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain04-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain04-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain04-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain04-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain04-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain04-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain04-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain04-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain04-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain04-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain04-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain04-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain04-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain04-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain04-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain04-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain04-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain04-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain04-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain04-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain04-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain04-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain04-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain05-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain05-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain05-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain05-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain05-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain05-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain05-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain05-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain05-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain05-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain05-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain05-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain05-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain05-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain05-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain05-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain05-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain05-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain05-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain05-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain05-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain05-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain05-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain05-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain06-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain06-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain06-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain06-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain06-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain06-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain06-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain06-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain06-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain06-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain06-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain06-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain06-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain06-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain06-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain06-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain06-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain06-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain06-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain06-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain06-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain06-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain06-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain06-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain07-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain07-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain07-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain07-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain07-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain07-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain07-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain07-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain07-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain07-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain07-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain07-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain07-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain07-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain07-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain07-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain07-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain07-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain07-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain07-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain07-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain07-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain07-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain07-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain08-01.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain08-01.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain08-01.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain08-01.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain08-02.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain08-02.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain08-02.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain08-02.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain08-03.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain08-03.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain08-03.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain08-03.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain08-04.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain08-04.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain08-04.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain08-04.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain08-05.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain08-05.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain08-05.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain08-05.txt diff --git a/src/com/jgaap/resources/aaac/problemM/Mtrain08-06.txt b/jgaap/src/main/resources/aaac/problemM/Mtrain08-06.txt similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/Mtrain08-06.txt rename to jgaap/src/main/resources/aaac/problemM/Mtrain08-06.txt diff --git a/src/com/jgaap/resources/aaac/problemM/loadM.csv b/jgaap/src/main/resources/aaac/problemM/loadM.csv similarity index 100% rename from src/com/jgaap/resources/aaac/problemM/loadM.csv rename to jgaap/src/main/resources/aaac/problemM/loadM.csv diff --git a/src/com/jgaap/resources/abbreviation.list b/jgaap/src/main/resources/abbreviation.list similarity index 100% rename from src/com/jgaap/resources/abbreviation.list rename to jgaap/src/main/resources/abbreviation.list diff --git a/lib/external/WordSegment.jar b/jgaap/src/main/resources/lib/WordSegment.jar similarity index 100% rename from lib/external/WordSegment.jar rename to jgaap/src/main/resources/lib/WordSegment.jar diff --git a/lib/external/commons-cli-1.2.jar b/jgaap/src/main/resources/lib/commons-cli-1.2.jar similarity index 100% rename from lib/external/commons-cli-1.2.jar rename to jgaap/src/main/resources/lib/commons-cli-1.2.jar diff --git a/lib/external/edu.mit.jwi_2.2.3.jar b/jgaap/src/main/resources/lib/edu.mit.jwi_2.2.3.jar similarity index 100% rename from lib/external/edu.mit.jwi_2.2.3.jar rename to jgaap/src/main/resources/lib/edu.mit.jwi_2.2.3.jar diff --git a/lib/external/guava-17.0.jar b/jgaap/src/main/resources/lib/guava-17.0.jar similarity index 100% rename from lib/external/guava-17.0.jar rename to jgaap/src/main/resources/lib/guava-17.0.jar diff --git a/lib/external/javassist-3.17.1.jar b/jgaap/src/main/resources/lib/javassist-3.17.1.jar similarity index 100% rename from lib/external/javassist-3.17.1.jar rename to jgaap/src/main/resources/lib/javassist-3.17.1.jar diff --git a/lib/external/jscience-4.3.1.jar b/jgaap/src/main/resources/lib/jscience-4.3.1.jar similarity index 100% rename from lib/external/jscience-4.3.1.jar rename to jgaap/src/main/resources/lib/jscience-4.3.1.jar diff --git a/lib/external/junit.jar b/jgaap/src/main/resources/lib/junit.jar similarity index 100% rename from lib/external/junit.jar rename to jgaap/src/main/resources/lib/junit.jar diff --git a/jgaap/src/main/resources/lib/log4j-api-2.23.1.jar b/jgaap/src/main/resources/lib/log4j-api-2.23.1.jar new file mode 100644 index 000000000..0e8e3f5e5 Binary files /dev/null and b/jgaap/src/main/resources/lib/log4j-api-2.23.1.jar differ diff --git a/jgaap/src/main/resources/lib/log4j-core-2.23.1.jar b/jgaap/src/main/resources/lib/log4j-core-2.23.1.jar new file mode 100644 index 000000000..4a5d553d8 Binary files /dev/null and b/jgaap/src/main/resources/lib/log4j-core-2.23.1.jar differ diff --git a/jgaap/src/main/resources/lib/log4j-iostreams-2.23.1.jar b/jgaap/src/main/resources/lib/log4j-iostreams-2.23.1.jar new file mode 100644 index 000000000..f966821c2 Binary files /dev/null and b/jgaap/src/main/resources/lib/log4j-iostreams-2.23.1.jar differ diff --git a/lib/external/reflections-0.9.8.jar b/jgaap/src/main/resources/lib/reflections-0.9.8.jar similarity index 100% rename from lib/external/reflections-0.9.8.jar rename to jgaap/src/main/resources/lib/reflections-0.9.8.jar diff --git a/lib/external/stanford-ner-2012-07-09.jar b/jgaap/src/main/resources/lib/stanford-ner-2012-07-09.jar similarity index 100% rename from lib/external/stanford-ner-2012-07-09.jar rename to jgaap/src/main/resources/lib/stanford-ner-2012-07-09.jar diff --git a/lib/external/stanford-postagger-2012-07-09.jar b/jgaap/src/main/resources/lib/stanford-postagger-2012-07-09.jar similarity index 100% rename from lib/external/stanford-postagger-2012-07-09.jar rename to jgaap/src/main/resources/lib/stanford-postagger-2012-07-09.jar diff --git a/lib/external/tika-app-1.5.jar b/jgaap/src/main/resources/lib/tika-app-1.5.jar similarity index 100% rename from lib/external/tika-app-1.5.jar rename to jgaap/src/main/resources/lib/tika-app-1.5.jar diff --git a/lib/external/weka.jar b/jgaap/src/main/resources/lib/weka.jar similarity index 100% rename from lib/external/weka.jar rename to jgaap/src/main/resources/lib/weka.jar diff --git a/src/com/jgaap/resources/models/ner/english.muc.7class.distsim.crf.ser.gz b/jgaap/src/main/resources/models/ner/english.muc.7class.distsim.crf.ser.gz similarity index 100% rename from src/com/jgaap/resources/models/ner/english.muc.7class.distsim.crf.ser.gz rename to jgaap/src/main/resources/models/ner/english.muc.7class.distsim.crf.ser.gz diff --git a/src/com/jgaap/resources/models/postagger/arabic-fast.tagger b/jgaap/src/main/resources/models/postagger/arabic-fast.tagger similarity index 100% rename from src/com/jgaap/resources/models/postagger/arabic-fast.tagger rename to jgaap/src/main/resources/models/postagger/arabic-fast.tagger diff --git a/src/com/jgaap/resources/models/postagger/chinese.tagger b/jgaap/src/main/resources/models/postagger/chinese.tagger similarity index 100% rename from src/com/jgaap/resources/models/postagger/chinese.tagger rename to jgaap/src/main/resources/models/postagger/chinese.tagger diff --git a/src/com/jgaap/resources/models/postagger/english-left3words-distsim.tagger b/jgaap/src/main/resources/models/postagger/english-left3words-distsim.tagger similarity index 100% rename from src/com/jgaap/resources/models/postagger/english-left3words-distsim.tagger rename to jgaap/src/main/resources/models/postagger/english-left3words-distsim.tagger diff --git a/src/com/jgaap/resources/models/postagger/french.tagger b/jgaap/src/main/resources/models/postagger/french.tagger similarity index 100% rename from src/com/jgaap/resources/models/postagger/french.tagger rename to jgaap/src/main/resources/models/postagger/french.tagger diff --git a/src/com/jgaap/resources/models/postagger/german-fast.tagger b/jgaap/src/main/resources/models/postagger/german-fast.tagger similarity index 100% rename from src/com/jgaap/resources/models/postagger/german-fast.tagger rename to jgaap/src/main/resources/models/postagger/german-fast.tagger diff --git a/src/com/jgaap/resources/ui/EVL_Icon_duq.png b/jgaap/src/main/resources/ui/EVL_Icon_duq.png similarity index 100% rename from src/com/jgaap/resources/ui/EVL_Icon_duq.png rename to jgaap/src/main/resources/ui/EVL_Icon_duq.png diff --git a/src/com/jgaap/resources/ui/LucidaGrande.ttf b/jgaap/src/main/resources/ui/LucidaGrande.ttf similarity index 100% rename from src/com/jgaap/resources/ui/LucidaGrande.ttf rename to jgaap/src/main/resources/ui/LucidaGrande.ttf diff --git a/jgaap/src/main/resources/ui/icon.icns b/jgaap/src/main/resources/ui/icon.icns new file mode 100644 index 000000000..5cb4d8aa3 Binary files /dev/null and b/jgaap/src/main/resources/ui/icon.icns differ diff --git a/jgaap/src/main/resources/ui/icon.ico b/jgaap/src/main/resources/ui/icon.ico new file mode 100644 index 000000000..442d7b040 Binary files /dev/null and b/jgaap/src/main/resources/ui/icon.ico differ diff --git a/src/com/jgaap/resources/ui/jgaap-icon.png b/jgaap/src/main/resources/ui/jgaap-icon.png similarity index 100% rename from src/com/jgaap/resources/ui/jgaap-icon.png rename to jgaap/src/main/resources/ui/jgaap-icon.png diff --git a/src/com/jgaap/resources/wordnet/Makefile b/jgaap/src/main/resources/wordnet/Makefile similarity index 100% rename from src/com/jgaap/resources/wordnet/Makefile rename to jgaap/src/main/resources/wordnet/Makefile diff --git a/src/com/jgaap/resources/wordnet/Makefile.am b/jgaap/src/main/resources/wordnet/Makefile.am similarity index 100% rename from src/com/jgaap/resources/wordnet/Makefile.am rename to jgaap/src/main/resources/wordnet/Makefile.am diff --git a/src/com/jgaap/resources/wordnet/Makefile.in b/jgaap/src/main/resources/wordnet/Makefile.in similarity index 100% rename from src/com/jgaap/resources/wordnet/Makefile.in rename to jgaap/src/main/resources/wordnet/Makefile.in diff --git a/src/com/jgaap/resources/wordnet/adj.exc b/jgaap/src/main/resources/wordnet/adj.exc similarity index 100% rename from src/com/jgaap/resources/wordnet/adj.exc rename to jgaap/src/main/resources/wordnet/adj.exc diff --git a/src/com/jgaap/resources/wordnet/adv.exc b/jgaap/src/main/resources/wordnet/adv.exc similarity index 100% rename from src/com/jgaap/resources/wordnet/adv.exc rename to jgaap/src/main/resources/wordnet/adv.exc diff --git a/src/com/jgaap/resources/wordnet/cntlist b/jgaap/src/main/resources/wordnet/cntlist similarity index 100% rename from src/com/jgaap/resources/wordnet/cntlist rename to jgaap/src/main/resources/wordnet/cntlist diff --git a/src/com/jgaap/resources/wordnet/cntlist.rev b/jgaap/src/main/resources/wordnet/cntlist.rev similarity index 100% rename from src/com/jgaap/resources/wordnet/cntlist.rev rename to jgaap/src/main/resources/wordnet/cntlist.rev diff --git a/src/com/jgaap/resources/wordnet/data.adj b/jgaap/src/main/resources/wordnet/data.adj similarity index 100% rename from src/com/jgaap/resources/wordnet/data.adj rename to jgaap/src/main/resources/wordnet/data.adj diff --git a/src/com/jgaap/resources/wordnet/data.adv b/jgaap/src/main/resources/wordnet/data.adv similarity index 100% rename from src/com/jgaap/resources/wordnet/data.adv rename to jgaap/src/main/resources/wordnet/data.adv diff --git a/src/com/jgaap/resources/wordnet/data.noun b/jgaap/src/main/resources/wordnet/data.noun similarity index 100% rename from src/com/jgaap/resources/wordnet/data.noun rename to jgaap/src/main/resources/wordnet/data.noun diff --git a/src/com/jgaap/resources/wordnet/data.verb b/jgaap/src/main/resources/wordnet/data.verb similarity index 100% rename from src/com/jgaap/resources/wordnet/data.verb rename to jgaap/src/main/resources/wordnet/data.verb diff --git a/src/com/jgaap/resources/wordnet/frames.vrb b/jgaap/src/main/resources/wordnet/frames.vrb similarity index 100% rename from src/com/jgaap/resources/wordnet/frames.vrb rename to jgaap/src/main/resources/wordnet/frames.vrb diff --git a/src/com/jgaap/resources/wordnet/index.adj b/jgaap/src/main/resources/wordnet/index.adj similarity index 100% rename from src/com/jgaap/resources/wordnet/index.adj rename to jgaap/src/main/resources/wordnet/index.adj diff --git a/src/com/jgaap/resources/wordnet/index.adv b/jgaap/src/main/resources/wordnet/index.adv similarity index 100% rename from src/com/jgaap/resources/wordnet/index.adv rename to jgaap/src/main/resources/wordnet/index.adv diff --git a/src/com/jgaap/resources/wordnet/index.noun b/jgaap/src/main/resources/wordnet/index.noun similarity index 100% rename from src/com/jgaap/resources/wordnet/index.noun rename to jgaap/src/main/resources/wordnet/index.noun diff --git a/src/com/jgaap/resources/wordnet/index.sense b/jgaap/src/main/resources/wordnet/index.sense similarity index 100% rename from src/com/jgaap/resources/wordnet/index.sense rename to jgaap/src/main/resources/wordnet/index.sense diff --git a/src/com/jgaap/resources/wordnet/index.verb b/jgaap/src/main/resources/wordnet/index.verb similarity index 100% rename from src/com/jgaap/resources/wordnet/index.verb rename to jgaap/src/main/resources/wordnet/index.verb diff --git a/src/com/jgaap/resources/wordnet/lexnames b/jgaap/src/main/resources/wordnet/lexnames similarity index 100% rename from src/com/jgaap/resources/wordnet/lexnames rename to jgaap/src/main/resources/wordnet/lexnames diff --git a/src/com/jgaap/resources/wordnet/log.grind.3.0 b/jgaap/src/main/resources/wordnet/log.grind.3.0 similarity index 100% rename from src/com/jgaap/resources/wordnet/log.grind.3.0 rename to jgaap/src/main/resources/wordnet/log.grind.3.0 diff --git a/src/com/jgaap/resources/wordnet/noun.exc b/jgaap/src/main/resources/wordnet/noun.exc similarity index 100% rename from src/com/jgaap/resources/wordnet/noun.exc rename to jgaap/src/main/resources/wordnet/noun.exc diff --git a/src/com/jgaap/resources/wordnet/sentidx.vrb b/jgaap/src/main/resources/wordnet/sentidx.vrb similarity index 100% rename from src/com/jgaap/resources/wordnet/sentidx.vrb rename to jgaap/src/main/resources/wordnet/sentidx.vrb diff --git a/src/com/jgaap/resources/wordnet/sents.vrb b/jgaap/src/main/resources/wordnet/sents.vrb similarity index 100% rename from src/com/jgaap/resources/wordnet/sents.vrb rename to jgaap/src/main/resources/wordnet/sents.vrb diff --git a/src/com/jgaap/resources/wordnet/verb.Framestext b/jgaap/src/main/resources/wordnet/verb.Framestext similarity index 100% rename from src/com/jgaap/resources/wordnet/verb.Framestext rename to jgaap/src/main/resources/wordnet/verb.Framestext diff --git a/src/com/jgaap/resources/wordnet/verb.exc b/jgaap/src/main/resources/wordnet/verb.exc similarity index 100% rename from src/com/jgaap/resources/wordnet/verb.exc rename to jgaap/src/main/resources/wordnet/verb.exc diff --git a/unittests/com/jgaap/JGAAPTest.java b/jgaap/src/test/java/com/jgaap/JGAAPTest.java similarity index 100% rename from unittests/com/jgaap/JGAAPTest.java rename to jgaap/src/test/java/com/jgaap/JGAAPTest.java diff --git a/unittests/com/jgaap/canonicizers/AddErrorsTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/AddErrorsTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/AddErrorsTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/AddErrorsTest.java diff --git a/unittests/com/jgaap/canonicizers/NormalizeASCIITest.java b/jgaap/src/test/java/com/jgaap/canonicizers/NormalizeASCIITest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/NormalizeASCIITest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/NormalizeASCIITest.java diff --git a/unittests/com/jgaap/canonicizers/NormalizeWhitespaceTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/NormalizeWhitespaceTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/NormalizeWhitespaceTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/NormalizeWhitespaceTest.java diff --git a/unittests/com/jgaap/canonicizers/PunctuationSeparatorTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/PunctuationSeparatorTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/PunctuationSeparatorTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/PunctuationSeparatorTest.java diff --git a/unittests/com/jgaap/canonicizers/SmashITest.java b/jgaap/src/test/java/com/jgaap/canonicizers/SmashITest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/SmashITest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/SmashITest.java diff --git a/unittests/com/jgaap/canonicizers/StripCommentsTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/StripCommentsTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/StripCommentsTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/StripCommentsTest.java diff --git a/unittests/com/jgaap/canonicizers/StripNonPuncTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/StripNonPuncTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/StripNonPuncTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/StripNonPuncTest.java diff --git a/unittests/com/jgaap/canonicizers/StripNumbersTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/StripNumbersTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/StripNumbersTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/StripNumbersTest.java diff --git a/unittests/com/jgaap/canonicizers/StripPunctuationTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/StripPunctuationTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/StripPunctuationTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/StripPunctuationTest.java diff --git a/unittests/com/jgaap/canonicizers/UnifyCaseTest.java b/jgaap/src/test/java/com/jgaap/canonicizers/UnifyCaseTest.java similarity index 100% rename from unittests/com/jgaap/canonicizers/UnifyCaseTest.java rename to jgaap/src/test/java/com/jgaap/canonicizers/UnifyCaseTest.java diff --git a/unittests/com/jgaap/classifiers/LDATest.java b/jgaap/src/test/java/com/jgaap/classifiers/LDATest.java similarity index 100% rename from unittests/com/jgaap/classifiers/LDATest.java rename to jgaap/src/test/java/com/jgaap/classifiers/LDATest.java diff --git a/unittests/com/jgaap/classifiers/LeaveOneOutNoDistanceDriverTest.java b/jgaap/src/test/java/com/jgaap/classifiers/LeaveOneOutNoDistanceDriverTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/LeaveOneOutNoDistanceDriverTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/LeaveOneOutNoDistanceDriverTest.java diff --git a/unittests/com/jgaap/classifiers/MahalanobisDistanceTest.java b/jgaap/src/test/java/com/jgaap/classifiers/MahalanobisDistanceTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/MahalanobisDistanceTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/MahalanobisDistanceTest.java diff --git a/unittests/com/jgaap/classifiers/MarkovChainAnalysisTest.java b/jgaap/src/test/java/com/jgaap/classifiers/MarkovChainAnalysisTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/MarkovChainAnalysisTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/MarkovChainAnalysisTest.java diff --git a/unittests/com/jgaap/classifiers/NearestNeighborDriverTest.java b/jgaap/src/test/java/com/jgaap/classifiers/NearestNeighborDriverTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/NearestNeighborDriverTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/NearestNeighborDriverTest.java diff --git a/unittests/com/jgaap/classifiers/NullAnalysisTest.java b/jgaap/src/test/java/com/jgaap/classifiers/NullAnalysisTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/NullAnalysisTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/NullAnalysisTest.java diff --git a/unittests/com/jgaap/classifiers/NullHistAnalysisTest.java b/jgaap/src/test/java/com/jgaap/classifiers/NullHistAnalysisTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/NullHistAnalysisTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/NullHistAnalysisTest.java diff --git a/unittests/com/jgaap/classifiers/WEKADecisionStumpTest.java b/jgaap/src/test/java/com/jgaap/classifiers/WEKADecisionStumpTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/WEKADecisionStumpTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/WEKADecisionStumpTest.java diff --git a/unittests/com/jgaap/classifiers/WEKAJ48DecisionTreeTest.java b/jgaap/src/test/java/com/jgaap/classifiers/WEKAJ48DecisionTreeTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/WEKAJ48DecisionTreeTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/WEKAJ48DecisionTreeTest.java diff --git a/unittests/com/jgaap/classifiers/WEKALeastMedSqTest.java b/jgaap/src/test/java/com/jgaap/classifiers/WEKALeastMedSqTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/WEKALeastMedSqTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/WEKALeastMedSqTest.java diff --git a/unittests/com/jgaap/classifiers/WEKALinearRegressionTest.java b/jgaap/src/test/java/com/jgaap/classifiers/WEKALinearRegressionTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/WEKALinearRegressionTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/WEKALinearRegressionTest.java diff --git a/unittests/com/jgaap/classifiers/WEKAMultilayerPerceptronTest.java b/jgaap/src/test/java/com/jgaap/classifiers/WEKAMultilayerPerceptronTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/WEKAMultilayerPerceptronTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/WEKAMultilayerPerceptronTest.java diff --git a/unittests/com/jgaap/classifiers/WEKANaiveBayesTest.java b/jgaap/src/test/java/com/jgaap/classifiers/WEKANaiveBayesTest.java similarity index 100% rename from unittests/com/jgaap/classifiers/WEKANaiveBayesTest.java rename to jgaap/src/test/java/com/jgaap/classifiers/WEKANaiveBayesTest.java diff --git a/unittests/com/jgaap/distances/AngularSeparationDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/AngularSeparationDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/AngularSeparationDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/AngularSeparationDistanceTest.java diff --git a/unittests/com/jgaap/distances/BhattacharyyaDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/BhattacharyyaDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/BhattacharyyaDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/BhattacharyyaDistanceTest.java diff --git a/unittests/com/jgaap/distances/BrayCurtisDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/BrayCurtisDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/BrayCurtisDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/BrayCurtisDistanceTest.java diff --git a/unittests/com/jgaap/distances/CanberraDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/CanberraDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/CanberraDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/CanberraDistanceTest.java diff --git a/unittests/com/jgaap/distances/ChiSquareDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/ChiSquareDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/ChiSquareDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/ChiSquareDistanceTest.java diff --git a/unittests/com/jgaap/distances/ChordDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/ChordDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/ChordDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/ChordDistanceTest.java diff --git a/unittests/com/jgaap/distances/CosineDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/CosineDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/CosineDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/CosineDistanceTest.java diff --git a/unittests/com/jgaap/distances/CrossEntropyDivergenceTest.java b/jgaap/src/test/java/com/jgaap/distances/CrossEntropyDivergenceTest.java similarity index 100% rename from unittests/com/jgaap/distances/CrossEntropyDivergenceTest.java rename to jgaap/src/test/java/com/jgaap/distances/CrossEntropyDivergenceTest.java diff --git a/unittests/com/jgaap/distances/DistanceTestHelper.java b/jgaap/src/test/java/com/jgaap/distances/DistanceTestHelper.java similarity index 100% rename from unittests/com/jgaap/distances/DistanceTestHelper.java rename to jgaap/src/test/java/com/jgaap/distances/DistanceTestHelper.java diff --git a/unittests/com/jgaap/distances/HistogramDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/HistogramDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/HistogramDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/HistogramDistanceTest.java diff --git a/unittests/com/jgaap/distances/HistogramIntersectionDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/HistogramIntersectionDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/HistogramIntersectionDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/HistogramIntersectionDistanceTest.java diff --git a/unittests/com/jgaap/distances/IntersectionDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/IntersectionDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/IntersectionDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/IntersectionDistanceTest.java diff --git a/unittests/com/jgaap/distances/KendallCorrelationDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/KendallCorrelationDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/KendallCorrelationDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/KendallCorrelationDistanceTest.java diff --git a/unittests/com/jgaap/distances/KendallCorrelationTauBDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/KendallCorrelationTauBDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/KendallCorrelationTauBDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/KendallCorrelationTauBDistanceTest.java diff --git a/unittests/com/jgaap/distances/KeseljWeightedDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/KeseljWeightedDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/KeseljWeightedDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/KeseljWeightedDistanceTest.java diff --git a/unittests/com/jgaap/distances/KullbackLeiblerDivergenceTest.java b/jgaap/src/test/java/com/jgaap/distances/KullbackLeiblerDivergenceTest.java similarity index 100% rename from unittests/com/jgaap/distances/KullbackLeiblerDivergenceTest.java rename to jgaap/src/test/java/com/jgaap/distances/KullbackLeiblerDivergenceTest.java diff --git a/unittests/com/jgaap/distances/ManhattanDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/ManhattanDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/ManhattanDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/ManhattanDistanceTest.java diff --git a/unittests/com/jgaap/distances/MatusitaDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/MatusitaDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/MatusitaDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/MatusitaDistanceTest.java diff --git a/unittests/com/jgaap/distances/NominalKSDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/NominalKSDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/NominalKSDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/NominalKSDistanceTest.java diff --git a/unittests/com/jgaap/distances/PearsonCorrelationDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/PearsonCorrelationDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/PearsonCorrelationDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/PearsonCorrelationDistanceTest.java diff --git a/unittests/com/jgaap/distances/SoergleDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/SoergleDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/SoergleDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/SoergleDistanceTest.java diff --git a/unittests/com/jgaap/distances/WEDDivergenceTest.java b/jgaap/src/test/java/com/jgaap/distances/WEDDivergenceTest.java similarity index 100% rename from unittests/com/jgaap/distances/WEDDivergenceTest.java rename to jgaap/src/test/java/com/jgaap/distances/WEDDivergenceTest.java diff --git a/unittests/com/jgaap/distances/WaveHedgesDistanceTest.java b/jgaap/src/test/java/com/jgaap/distances/WaveHedgesDistanceTest.java similarity index 100% rename from unittests/com/jgaap/distances/WaveHedgesDistanceTest.java rename to jgaap/src/test/java/com/jgaap/distances/WaveHedgesDistanceTest.java diff --git a/unittests/com/jgaap/eventCullers/CoefficientOfVariationTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/CoefficientOfVariationTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/CoefficientOfVariationTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/CoefficientOfVariationTest.java diff --git a/unittests/com/jgaap/eventCullers/ExtremeCullerTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/ExtremeCullerTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/ExtremeCullerTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/ExtremeCullerTest.java diff --git a/unittests/com/jgaap/eventCullers/IQRCullerTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/IQRCullerTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/IQRCullerTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/IQRCullerTest.java diff --git a/unittests/com/jgaap/eventCullers/IndexOfDispersionTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/IndexOfDispersionTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/IndexOfDispersionTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/IndexOfDispersionTest.java diff --git a/unittests/com/jgaap/eventCullers/InformationGainTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/InformationGainTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/InformationGainTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/InformationGainTest.java diff --git a/unittests/com/jgaap/eventCullers/LeastCommonEventsTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/LeastCommonEventsTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/LeastCommonEventsTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/LeastCommonEventsTest.java diff --git a/unittests/com/jgaap/eventCullers/MeanAbsoluteDeviationTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/MeanAbsoluteDeviationTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/MeanAbsoluteDeviationTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/MeanAbsoluteDeviationTest.java diff --git a/unittests/com/jgaap/eventCullers/MostCommonEventsTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/MostCommonEventsTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/MostCommonEventsTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/MostCommonEventsTest.java diff --git a/unittests/com/jgaap/eventCullers/PercentageRangeCullerTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/PercentageRangeCullerTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/PercentageRangeCullerTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/PercentageRangeCullerTest.java diff --git a/unittests/com/jgaap/eventCullers/RangeCullerTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/RangeCullerTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/RangeCullerTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/RangeCullerTest.java diff --git a/unittests/com/jgaap/eventCullers/StandardDeviationCullerTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/StandardDeviationCullerTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/StandardDeviationCullerTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/StandardDeviationCullerTest.java diff --git a/unittests/com/jgaap/eventCullers/VarianceCullerTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/VarianceCullerTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/VarianceCullerTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/VarianceCullerTest.java diff --git a/unittests/com/jgaap/eventCullers/WeightedVarianceTest.java b/jgaap/src/test/java/com/jgaap/eventCullers/WeightedVarianceTest.java similarity index 100% rename from unittests/com/jgaap/eventCullers/WeightedVarianceTest.java rename to jgaap/src/test/java/com/jgaap/eventCullers/WeightedVarianceTest.java diff --git a/unittests/com/jgaap/eventDrivers/CharacterBiGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/CharacterBiGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/CharacterBiGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/CharacterBiGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/CharacterEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/CharacterEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/CharacterEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/CharacterEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/CharacterTetraGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/CharacterTetraGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/CharacterTetraGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/CharacterTetraGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/CharacterTriGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/CharacterTriGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/CharacterTriGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/CharacterTriGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/DefinitionsEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/DefinitionsEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/DefinitionsEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/DefinitionsEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/DisLegomenaEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/DisLegomenaEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/DisLegomenaEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/DisLegomenaEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/FirstWordInSentenceEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/FirstWordInSentenceEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/FirstWordInSentenceEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/FirstWordInSentenceEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/FreqEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/FreqEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/FreqEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/FreqEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/HDLegomenaEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/HDLegomenaEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/HDLegomenaEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/HDLegomenaEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/HapaxLegomenaEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/HapaxLegomenaEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/HapaxLegomenaEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/HapaxLegomenaEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/KSkipNGramCharacterEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/KSkipNGramWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/KSkipNGramWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/KSkipNGramWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/KSkipNGramWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/LineLengthEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/LineLengthEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/LineLengthEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/LineLengthEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/MNLetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/MNLetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/MNLetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/MNLetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/MWFunctionWordsEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/MWFunctionWordsEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/MWFunctionWordsEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/MWFunctionWordsEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/NaiveWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/NaiveWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/NaiveWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/NaiveWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/NamingTimeEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/NamingTimeEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/NamingTimeEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/NamingTimeEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/NullEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/NullEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/NullEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/NullEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/POSBiGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/POSBiGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/POSBiGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/POSBiGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/PartOfSpeechEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/PartOfSpeechEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/PartOfSpeechEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/PartOfSpeechEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/PorterStemmerEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/PorterStemmerEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/PorterStemmerEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/PorterStemmerEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/PorterStemmerWithIrregularEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/RareWordsEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/RareWordsEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/RareWordsEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/RareWordsEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/ReactionTimeEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/ReactionTimeEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/ReactionTimeEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/ReactionTimeEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/SentenceEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/SentenceEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/SentenceEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/SentenceEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/SentenceLengthWithWordsEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/SuffixEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/SuffixEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/SuffixEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/SuffixEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/SyllableTransitionEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/SyllableTransitionEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/SyllableTransitionEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/SyllableTransitionEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/TruncatedFreqEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/TruncatedFreqEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/TruncatedFreqEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/TruncatedFreqEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/TruncatedNamingTimeEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/TruncatedReactionTimeEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/V23LetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/V23LetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/V23LetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/V23LetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/V24LetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/V24LetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/V24LetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/V24LetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/V34LetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/V34LetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/V34LetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/V34LetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/VowelInitialWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/VowelInitialWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/VowelInitialWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/VowelInitialWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/VowelMNLetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/VowelMNLetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/VowelMNLetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/VowelMNLetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/WordBiGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/WordBiGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/WordBiGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/WordBiGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/WordLengthEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/WordLengthEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/WordLengthEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/WordLengthEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/WordSyllablesEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/WordSyllablesEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/WordSyllablesEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/WordSyllablesEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/WordTetraGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/WordTetraGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/WordTetraGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/WordTetraGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/WordTriGramEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/WordTriGramEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/WordTriGramEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/WordTriGramEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/_23LetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/_23LetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/_23LetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/_23LetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/_24LetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/_24LetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/_24LetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/_24LetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/eventDrivers/_34LetterWordEventDriverTest.java b/jgaap/src/test/java/com/jgaap/eventDrivers/_34LetterWordEventDriverTest.java similarity index 100% rename from unittests/com/jgaap/eventDrivers/_34LetterWordEventDriverTest.java rename to jgaap/src/test/java/com/jgaap/eventDrivers/_34LetterWordEventDriverTest.java diff --git a/unittests/com/jgaap/generics/EventHistogramTest.java b/jgaap/src/test/java/com/jgaap/generics/EventHistogramTest.java similarity index 100% rename from unittests/com/jgaap/generics/EventHistogramTest.java rename to jgaap/src/test/java/com/jgaap/generics/EventHistogramTest.java diff --git a/unittests/com/jgaap/generics/PairTest.java b/jgaap/src/test/java/com/jgaap/generics/PairTest.java similarity index 100% rename from unittests/com/jgaap/generics/PairTest.java rename to jgaap/src/test/java/com/jgaap/generics/PairTest.java diff --git a/unittests/com/jgaap/resources/articles.txt b/jgaap/src/test/java/com/jgaap/resources/articles.txt similarity index 100% rename from unittests/com/jgaap/resources/articles.txt rename to jgaap/src/test/java/com/jgaap/resources/articles.txt diff --git a/jgaap/src/test/resources/articles.txt b/jgaap/src/test/resources/articles.txt new file mode 100644 index 000000000..29c0faf88 --- /dev/null +++ b/jgaap/src/test/resources/articles.txt @@ -0,0 +1,8 @@ +a +A +an +An +AN +the +The +THE diff --git a/lib/external/log4j-api-2.15.0.jar b/lib/external/log4j-api-2.15.0.jar deleted file mode 100644 index 77f6b2bef..000000000 Binary files a/lib/external/log4j-api-2.15.0.jar and /dev/null differ diff --git a/lib/external/log4j-core-2.15.0.jar b/lib/external/log4j-core-2.15.0.jar deleted file mode 100644 index 5d6a73a65..000000000 Binary files a/lib/external/log4j-core-2.15.0.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..a25d80884 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.8/userguide/multi_project_builds.html in the Gradle documentation. + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + +rootProject.name = 'JGAAP' +include('jgaap') diff --git a/src/build.xml b/src/build.xml deleted file mode 100644 index 1c17a6a4b..000000000 --- a/src/build.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/com/jgaap/JGAAP.java b/src/com/jgaap/JGAAP.java deleted file mode 100644 index 051f1d888..000000000 --- a/src/com/jgaap/JGAAP.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * JGAAP -- a graphical program for stylometric authorship attribution - * Copyright (C) 2009,2011 by Patrick Juola - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -/** - **/ -package com.jgaap; - -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; - -import com.jgaap.backend.CLI; -import com.jgaap.ui.JGAAP_UI_MainForm; - -/** - * The jgaap main file. - * - * @author michael ryan - */ - -public class JGAAP { - - static Logger logger = Logger.getLogger("com.jgaap"); - static Logger mainLogger = Logger.getLogger(JGAAP.class); - - public static boolean commandline = false; - - /** - * Launches the jgaap GUI. - */ - private static void createAndShowGUI() { - JGAAP_UI_MainForm gui = new JGAAP_UI_MainForm(); - gui.setVisible(true); - } - -/** - * launches either the CLI or the GUI based on the command line arguments - * @param args the command line arguments - */ - public static void main(String[] args) { - - BasicConfigurator.configure(); - logger.setLevel(Level.INFO); - - if (args.length == 0) { - mainLogger.info("Starting GUI"); - javax.swing.SwingUtilities.invokeLater(new Runnable() { - public void run() { - createAndShowGUI(); - } - }); - } else { - mainLogger.info("Starting CLI"); - try { - CLI.main(args); - } catch (Exception e) { - mainLogger.fatal("Command Line Failure", e); - } - } - } -}