├── $APP_CONFIG$ ├── uml.xml ├── emmet.xml ├── macros.xml ├── osmorc.xml ├── consoleFolding.xml ├── intentionSettings.xml ├── remote-servers.xml ├── mavenVersion.xml ├── encoding.xml ├── baseRefactoring.xml ├── scala_config.xml ├── github_settings.xml ├── colors.scheme.xml ├── groovy_config.xml ├── rubysettings.xml ├── VisualVMLauncher.xml ├── scala.xml ├── proxy.settings.xml ├── mavenServices.xml ├── file.template.settings.xml ├── markdown.xml ├── editor.xml ├── notifications.xml ├── find.xml ├── debugger.xml ├── usageView.xml ├── ui.lnf.xml ├── customization.xml ├── ide.general.xml ├── filetypes.xml ├── web-browsers.xml ├── dataSources.xml ├── IntelliLang.xml ├── tasks.xml ├── databaseSettings.xml ├── editor.codeinsight.xml ├── diff.xml ├── ignore.xml ├── watcherDefaultTasks.xml ├── debugger.renderers.xml ├── vcs.xml ├── databaseDrivers.xml ├── grepConsole.xml ├── GrepConsole.xml ├── toStringTemplates.xml ├── project.default.xml ├── templates.xml └── other.xml ├── $ROOT_CONFIG$ ├── shelf │ ├── SR-5093__Member_Selector_Enhancements__-_Remove_soundex_support.patch │ ├── Acurity logo.png │ ├── gradle-wrapper.jar │ ├── Acurity_Full_Logo.png │ ├── gradle-wrapper1.jar │ ├── shelve_AcurityServer_changes.patch │ ├── Report_screen_crash_with_more_than_one_allowed_report_group.patch │ ├── This_is_a_shelved_chaneset_2.patch │ ├── SR-7121.patch │ ├── Fix_crash_when_an_error_occurs_when_reverting_a_reallocation.patch │ ├── This_is_a_shelved_chaneset_21.patch │ ├── This_is_a_shelved_chaneset.patch │ ├── Bad_thread_access.patch │ ├── SR-7945__Fix_AIS_unit_and_integration_tests__-_Rationalise_integration_test_setup.patch │ ├── SR-71211.patch │ ├── SR-7945__Fix_AIS_unit_and_integration_tests__-_Add_Logging_output_stream_to_gradle_plugin.patch │ ├── SR-7607__Work_test_identified_functionality_gaps_-_java_changes__-_Fix_issue_when_setting_.patch │ ├── SR-7831__Event_Management_-_Grid_row_select_bug.patch │ └── unnamed.patch ├── templates │ ├── other.xml │ └── Groovy.xml ├── codestyles │ ├── Default _1_.xml │ └── My Standard Code Style.xml ├── keymaps │ └── My Keymap.xml ├── inspection │ └── My Inspections.xml └── colors │ └── Wombat.icls ├── _linux └── $APP_CONFIG$ │ ├── keymap.xml │ ├── laf.xml │ ├── path.macros.xml │ └── git.xml ├── _mac └── $APP_CONFIG$ │ ├── keymap.xml │ ├── laf.xml │ ├── path.macros.xml │ └── git.xml └── _windows └── $APP_CONFIG$ ├── keymap.xml ├── laf.xml ├── git.xml ├── path.macros.xml └── hg.xml /$APP_CONFIG$/uml.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$APP_CONFIG$/emmet.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$APP_CONFIG$/macros.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$APP_CONFIG$/osmorc.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-5093__Member_Selector_Enhancements__-_Remove_soundex_support.patch: -------------------------------------------------------------------------------- 1 | -------------------------------------------------------------------------------- /$APP_CONFIG$/consoleFolding.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$APP_CONFIG$/intentionSettings.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$APP_CONFIG$/remote-servers.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | -------------------------------------------------------------------------------- /$APP_CONFIG$/mavenVersion.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/Acurity logo.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gavia/intellij-settings/master/$ROOT_CONFIG$/shelf/Acurity logo.png -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/gradle-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gavia/intellij-settings/master/$ROOT_CONFIG$/shelf/gradle-wrapper.jar -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/Acurity_Full_Logo.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gavia/intellij-settings/master/$ROOT_CONFIG$/shelf/Acurity_Full_Logo.png -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/gradle-wrapper1.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gavia/intellij-settings/master/$ROOT_CONFIG$/shelf/gradle-wrapper1.jar -------------------------------------------------------------------------------- /_linux/$APP_CONFIG$/keymap.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /_mac/$APP_CONFIG$/keymap.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /_windows/$APP_CONFIG$/keymap.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /$APP_CONFIG$/encoding.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | -------------------------------------------------------------------------------- /_linux/$APP_CONFIG$/laf.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /_mac/$APP_CONFIG$/laf.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /_windows/$APP_CONFIG$/laf.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /_mac/$APP_CONFIG$/path.macros.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /$APP_CONFIG$/baseRefactoring.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 5 | -------------------------------------------------------------------------------- /_linux/$APP_CONFIG$/path.macros.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /$APP_CONFIG$/scala_config.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 5 | -------------------------------------------------------------------------------- /_windows/$APP_CONFIG$/git.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 5 | -------------------------------------------------------------------------------- /$APP_CONFIG$/github_settings.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 6 | -------------------------------------------------------------------------------- /_mac/$APP_CONFIG$/git.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 6 | -------------------------------------------------------------------------------- /_linux/$APP_CONFIG$/git.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 6 | -------------------------------------------------------------------------------- /$APP_CONFIG$/colors.scheme.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 6 | -------------------------------------------------------------------------------- /$APP_CONFIG$/groovy_config.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 6 | -------------------------------------------------------------------------------- /$APP_CONFIG$/rubysettings.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 8 | 9 | -------------------------------------------------------------------------------- /$APP_CONFIG$/VisualVMLauncher.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 6 | 7 | 8 | -------------------------------------------------------------------------------- /$APP_CONFIG$/scala.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 7 | -------------------------------------------------------------------------------- /$APP_CONFIG$/proxy.settings.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 8 | -------------------------------------------------------------------------------- /$APP_CONFIG$/mavenServices.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | http://oss.sonatype.org/service/local/ 4 | http://repo.jfrog.org/artifactory/api/ 5 | https://repository.jboss.org/nexus/service/local/ 6 | 7 | -------------------------------------------------------------------------------- /$APP_CONFIG$/file.template.settings.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | -------------------------------------------------------------------------------- /$APP_CONFIG$/markdown.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | -------------------------------------------------------------------------------- /$APP_CONFIG$/editor.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 8 | -------------------------------------------------------------------------------- /$APP_CONFIG$/notifications.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | -------------------------------------------------------------------------------- /$APP_CONFIG$/find.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 9 | -------------------------------------------------------------------------------- /$APP_CONFIG$/debugger.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | true 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/templates/other.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/templates/Groovy.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | -------------------------------------------------------------------------------- /_windows/$APP_CONFIG$/path.macros.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | -------------------------------------------------------------------------------- /$APP_CONFIG$/usageView.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 10 | -------------------------------------------------------------------------------- /_windows/$APP_CONFIG$/hg.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 10 | 11 | -------------------------------------------------------------------------------- /$APP_CONFIG$/ui.lnf.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 10 | -------------------------------------------------------------------------------- /$APP_CONFIG$/customization.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 10 | 11 | -------------------------------------------------------------------------------- /$APP_CONFIG$/ide.general.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 10 | 11 | 12 | 13 | 14 | 15 | -------------------------------------------------------------------------------- /$APP_CONFIG$/filetypes.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/shelve_AcurityServer_changes.patch: -------------------------------------------------------------------------------- 1 | Index: ../masterProject/settings.gradle 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- ../masterProject/settings.gradle (revision 27932:ee2d35e404388c1cd81a439ae7d3be1936ad6580) 7 | +++ ../masterProject/settings.gradle (revision 27932+:ee2d35e40438+) 8 | @@ -3,6 +3,7 @@ 9 | 'acurityCommon', 10 | 'acurityDataModel', 11 | 'AcurityManager', 12 | + 'AcurityServer', 13 | 'AcurityWebServices', 14 | 'AcurityWebVaadin', 15 | 'architect-std', 16 | \ No newline at end of file 17 | -------------------------------------------------------------------------------- /$APP_CONFIG$/web-browsers.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | -------------------------------------------------------------------------------- /$APP_CONFIG$/dataSources.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | sqlserver.ms 5 | true 6 | com.microsoft.sqlserver.jdbc.SQLServerDriver 7 | jdbc:sqlserver://Fsysql02\fsy_dev_test;databaseName=Superstream_Dev2 8 | -Djava.library.path="C:\Program Files (x86)\JetBrains\IntelliJ IDEA 13.1.2\jre\jre\bin" 9 | 10 | 11 | 12 | 13 | 14 | 15 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/Report_screen_crash_with_more_than_one_allowed_report_group.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/hibernate/tools/querybuilder/ParameterisedSQLFragment.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/hibernate/tools/querybuilder/ParameterisedSQLFragment.java (revision 27717:0acb24383d650e1a43c5e781748c653fe0303eb6) 7 | +++ src/main/java/au/com/finsyn/hibernate/tools/querybuilder/ParameterisedSQLFragment.java (revision 27717+:0acb24383d65+) 8 | @@ -444,6 +444,7 @@ 9 | 10 | for (Object value : values) { 11 | returnedFragment.append(delimiter).appendParameter(value); 12 | + delimiter = ","; 13 | } 14 | 15 | returnedFragment.append(")"); 16 | -------------------------------------------------------------------------------- /$APP_CONFIG$/IntelliLang.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 13 | -------------------------------------------------------------------------------- /$APP_CONFIG$/tasks.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/codestyles/Default _1_.xml: -------------------------------------------------------------------------------- 1 | 2 | 14 | -------------------------------------------------------------------------------- /$APP_CONFIG$/databaseSettings.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 24 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/This_is_a_shelved_chaneset_2.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java (revision 27901:83291e73c0a44904082b19b3a6982ce6aeb5ae9e) 7 | +++ src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java (revision 27901+:83291e73c0a4+) 8 | @@ -787,7 +787,6 @@ 9 | --i; 10 | } else if (!CONTRIBUTION_REFUNDABLE_STATUS.contains(getContributionLineStatus(contributionLine))) { 11 | ContributionLineRejectHolder h = new ContributionLineRejectHolder(); 12 | - h.contributionLine = contributionLine; 13 | h.rejectReason = "Invalid status of: " + contributionLine.getFCz_Status(); 14 | rejectedContributionLines.add(h); 15 | 16 | -------------------------------------------------------------------------------- /$APP_CONFIG$/editor.codeinsight.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 13 | 14 | 15 | 21 | -------------------------------------------------------------------------------- /$APP_CONFIG$/diff.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 18 | 19 | 20 | 40 | 41 | -------------------------------------------------------------------------------- /$APP_CONFIG$/ignore.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 27 | 28 | 29 | -------------------------------------------------------------------------------- /$APP_CONFIG$/watcherDefaultTasks.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 21 | 29 | 30 | -------------------------------------------------------------------------------- /$APP_CONFIG$/debugger.renderers.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 33 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/codestyles/My Standard Code Style.xml: -------------------------------------------------------------------------------- 1 | 2 | 14 | 19 | -------------------------------------------------------------------------------- /$APP_CONFIG$/vcs.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 19 | 21 | 22 | 38 | 40 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-7121.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/workbench/manage/model/ContributionDetailsTableModel.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/workbench/manage/model/ContributionDetailsTableModel.java (revision 27705:a6995256ede76ada7d4e4e8f31b1ffe81236cce5) 7 | +++ src/main/java/au/com/finsyn/workbench/manage/model/ContributionDetailsTableModel.java (revision 27705+:a6995256ede7+) 8 | @@ -68,9 +68,18 @@ 9 | } 10 | 11 | public static boolean shouldDisplayContributionLine(ContributionLines c ) { 12 | - return (!WorkbenchCommonUtils.isRefundedContributionLine(c) 13 | - && !WorkbenchCommonUtils.CONTRIBUTION_REFUND_RELATED_STATUS.contains(getContributionLineStatus(c))); 14 | + return !WorkbenchCommonUtils.isRefundedContributionLine(c) 15 | + && !ContributionLineStatuses.REFUNDED.getCode().equals(c.getFCz_Status()) 16 | + && !ContributionLineStatuses.REVERSING.getCode().equals(c.getFCz_Status()) 17 | + && !ContributionLineStatuses.REVERSED.getCode().equals(c.getFCz_Status()) 18 | + && !isDummyRefundingLine(c); 19 | + } 20 | + 21 | + public static boolean isDummyRefundingLine(ContributionLines fcLine) { 22 | + return fcLine.getFCz_Status().equals(ContributionLineStatuses.REFUNDING.getCode()) 23 | + && fcLine.getFCs_Orig_Sequence() != 0 24 | + && fcLine.getFCs_Orig_Sequence() != fcLine.getFCs_Sequence(); 25 | - } 26 | + } 27 | 28 | public DefaultTotalsTableModel getTotalsTableModel() { 29 | return totalsTableModel; 30 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/Fix_crash_when_an_error_occurs_when_reverting_a_reallocation.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/workbench/manage/model/ProcessSelectedRecordsTask.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/workbench/manage/model/ProcessSelectedRecordsTask.java (revision 27717:0acb24383d650e1a43c5e781748c653fe0303eb6) 7 | +++ src/main/java/au/com/finsyn/workbench/manage/model/ProcessSelectedRecordsTask.java (revision 27717+:0acb24383d65+) 8 | @@ -34,6 +34,8 @@ 9 | import au.com.finsyn.workbench.WorkbenchCommonUtils.StaticDataLineStatuses; 10 | import au.com.finsyn.workbench.WorkbenchCommonUtils.WorkbenchLineStatuses; 11 | 12 | +import javax.swing.*; 13 | + 14 | public class ProcessSelectedRecordsTask extends GenericTask { 15 | private static final String fwTable = AcurityNamingStrategy.INSTANCE.classToTableName(WorkbenchLines.class); 16 | private static final String fcTable = AcurityNamingStrategy.INSTANCE.classToTableName(ContributionLines.class); 17 | @@ -118,7 +120,8 @@ 18 | public static Object processWorkbenchFilesAndShowErrors(Collection fileRegisters, String batchCode) { 19 | for (FileRegister fg : fileRegisters) { 20 | Object result = processWorkbenchFile(fg, batchCode); 21 | - if (!AcurityCommandGeneric.checkForErrorsAndShowDialog(result)) { 22 | + if (AcurityCommandGeneric.hasErrors(result)) { 23 | + SwingUtilities.invokeLater(() -> AcurityCommandGeneric.checkForErrorsAndShowDialog(result)); 24 | return result; 25 | } 26 | } 27 | \ No newline at end of file 28 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/This_is_a_shelved_chaneset_21.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java (revision 27901:83291e73c0a44904082b19b3a6982ce6aeb5ae9e) 7 | +++ src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java (revision 27901+:83291e73c0a4+) 8 | @@ -781,7 +781,7 @@ 9 | 10 | if (contributionLine.getFCc_Deleted() == 'Y' || 11 | WorkbenchCommonUtils.isRefundedContributionLine(contributionLine) || 12 | - WorkbenchCommonUtils.CONTRIBUTION_REFUND_RELATED_STATUS.contains(getContributionLineStatus(contributionLine))) { 13 | + WorkbenchCommonUtils.isContributionRefundRelated(contributionLine)) { 14 | // REFUND related contribution lines are not shown to the user, so we don't need to warn when they are removed. 15 | selectedContributionLines.remove(i); 16 | --i; 17 | @@ -936,7 +936,7 @@ 18 | 19 | if (contributionLine.getFCc_Deleted() == 'Y' || 20 | WorkbenchCommonUtils.isRefundedContributionLine(contributionLine) || 21 | - WorkbenchCommonUtils.CONTRIBUTION_REFUND_RELATED_STATUS.contains(getContributionLineStatus(contributionLine))) { 22 | + WorkbenchCommonUtils.isContributionRefundRelated(contributionLine)) { 23 | // REFUND related contribution lines are not shown to the user, so we don't need to warn when they are removed. 24 | selectedContributionLines.remove(i); 25 | --i; 26 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/This_is_a_shelved_chaneset.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java (revision 27901:83291e73c0a44904082b19b3a6982ce6aeb5ae9e) 7 | +++ src/main/java/au/com/finsyn/workbench/manage/ManageWorkbenchLinesView.java (revision 27901+:83291e73c0a4+) 8 | @@ -781,7 +781,7 @@ 9 | 10 | if (contributionLine.getFCc_Deleted() == 'Y' || 11 | WorkbenchCommonUtils.isRefundedContributionLine(contributionLine) || 12 | - WorkbenchCommonUtils.CONTRIBUTION_REFUND_RELATED_STATUS.contains(getContributionLineStatus(contributionLine))) { 13 | + WorkbenchCommonUtils.isContributionRefundRelated(contributionLine)) { 14 | // REFUND related contribution lines are not shown to the user, so we don't need to warn when they are removed. 15 | selectedContributionLines.remove(i); 16 | --i; 17 | @@ -936,7 +936,7 @@ 18 | 19 | if (contributionLine.getFCc_Deleted() == 'Y' || 20 | WorkbenchCommonUtils.isRefundedContributionLine(contributionLine) || 21 | - WorkbenchCommonUtils.CONTRIBUTION_REFUND_RELATED_STATUS.contains(getContributionLineStatus(contributionLine))) { 22 | + WorkbenchCommonUtils.isContributionRefundRelated(contributionLine)) { 23 | // REFUND related contribution lines are not shown to the user, so we don't need to warn when they are removed. 24 | selectedContributionLines.remove(i); 25 | --i; 26 | Index: gradle/wrapper/gradle-wrapper.properties 27 | IDEA additional info: 28 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 29 | <+>windows-1252 30 | =================================================================== 31 | --- gradle/wrapper/gradle-wrapper.properties (revision 27901:83291e73c0a44904082b19b3a6982ce6aeb5ae9e) 32 | +++ gradle/wrapper/gradle-wrapper.properties (revision 27901+:83291e73c0a4+) 33 | @@ -1,6 +1,6 @@ 34 | -#Tue Jun 02 14:41:28 AEST 2015 35 | +#Wed Jun 03 08:55:38 AEST 2015 36 | distributionBase=GRADLE_USER_HOME 37 | distributionPath=wrapper/dists 38 | zipStoreBase=GRADLE_USER_HOME 39 | zipStorePath=wrapper/dists 40 | -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip 41 | +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip 42 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/Bad_thread_access.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/jSSS/jgui/CustomisationsEditor/validation/CustomisationFilesUpgrader.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/jSSS/jgui/CustomisationsEditor/validation/CustomisationFilesUpgrader.java (revision 27877:0cd0679970a3be01c5890741db7eb4f55be47f4c) 7 | +++ src/main/java/jSSS/jgui/CustomisationsEditor/validation/CustomisationFilesUpgrader.java (revision 27877+:0cd0679970a3+) 8 | @@ -6,11 +6,9 @@ 9 | */ 10 | package jSSS.jgui.CustomisationsEditor.validation; 11 | 12 | -import static jSSS.preferences.AcurityProperty.ADD_CUSTOMISATION_UPGRADE_COMMENTS; 13 | import jSSS.jcore.jSSSApplication; 14 | import jSSS.jcore.swing.worker.SwingWorker; 15 | import jSSS.jgui.Const; 16 | -import jSSS.jgui.jSSSApp; 17 | import jSSS.jgui.CustomisationsEditor.CEdtrConstants; 18 | import jSSS.jgui.CustomisationsEditor.CustomisationsEditor; 19 | import jSSS.jgui.CustomisationsEditor.EditorUtils; 20 | @@ -21,10 +19,14 @@ 21 | import jSSS.jgui.CustomisationsEditor.definitions.ESHistoryDefinition; 22 | import jSSS.jgui.CustomisationsEditor.functions.ListOfGUIForms; 23 | import jSSS.jgui.comm.Client; 24 | +import jSSS.jgui.jSSSApp; 25 | import jSSS.util.ICStringConst; 26 | import jSSS.util.Msg; 27 | import jSSS.util.jSSSLogger; 28 | 29 | +import javax.swing.JDialog; 30 | +import javax.swing.JOptionPane; 31 | +import javax.swing.SwingUtilities; 32 | import java.io.IOException; 33 | import java.util.ArrayList; 34 | import java.util.Arrays; 35 | @@ -33,9 +35,7 @@ 36 | import java.util.List; 37 | import java.util.Map; 38 | 39 | -import javax.swing.JDialog; 40 | -import javax.swing.JOptionPane; 41 | -import javax.swing.SwingUtilities; 42 | +import static jSSS.preferences.AcurityProperty.ADD_CUSTOMISATION_UPGRADE_COMMENTS; 43 | 44 | /** 45 | * @author tetyanag 46 | @@ -245,7 +245,10 @@ 47 | } 48 | return null; 49 | } 50 | - }; 51 | + }; 52 | + // Make sure we initialise the CustomisationsEditor singleton on the EDT, given that it will be used within 53 | + // the worker 54 | + CustomisationsEditor.getInstance(); 55 | 56 | worker.start(); 57 | showUpgradeResults(); 58 | Index: src/main/java/jSSS/startup/NewUI.java 59 | IDEA additional info: 60 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 61 | <+>windows-1252 62 | =================================================================== 63 | --- src/main/java/jSSS/startup/NewUI.java (revision 27877:0cd0679970a3be01c5890741db7eb4f55be47f4c) 64 | +++ src/main/java/jSSS/startup/NewUI.java (revision 27877+:0cd0679970a3+) 65 | @@ -6,17 +6,27 @@ 66 | import jSSS.util.ResourceLoader; 67 | import org.apache.commons.logging.Log; 68 | 69 | -import javax.swing.*; 70 | -import java.awt.*; 71 | -import java.io.*; 72 | +import javax.swing.ImageIcon; 73 | +import javax.swing.SwingUtilities; 74 | +import java.awt.Color; 75 | +import java.awt.Dimension; 76 | +import java.awt.Font; 77 | +import java.io.BufferedInputStream; 78 | +import java.io.File; 79 | +import java.io.FileInputStream; 80 | +import java.io.FileNotFoundException; 81 | +import java.io.IOException; 82 | +import java.io.InputStream; 83 | import java.util.Properties; 84 | 85 | /* 86 | * Breaking changes: 87 | * 1. Umit replaced the splash_screen and login_screen images inside the jar file. 88 | */ 89 | -public class NewUI { 90 | +public enum NewUI { 91 | 92 | + INSTANCE; 93 | + 94 | private static final Log LOG = AcurityLogging.getInstance().getLogger(NewUI.class); 95 | public static final String FILE_LOCATION = "Customisations/NewUI.properties"; 96 | 97 | @@ -64,8 +74,6 @@ 98 | public int listFormFontSize = 0; 99 | 100 | private boolean isNewUI = true; 101 | - 102 | - private static NewUI INSTANCE; 103 | 104 | /** 105 | * NOT THREAD SAFE 106 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-7945__Fix_AIS_unit_and_integration_tests__-_Rationalise_integration_test_setup.patch: -------------------------------------------------------------------------------- 1 | Index: buildSrc/src/main/groovy/au/com/finsyn/acuritywebservices/build/IntegrationTestSetup.groovy 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- buildSrc/src/main/groovy/au/com/finsyn/acuritywebservices/build/IntegrationTestSetup.groovy (revision 30121+:e368fdb8403d+) 7 | +++ buildSrc/src/main/groovy/au/com/finsyn/acuritywebservices/build/IntegrationTestSetup.groovy (revision 30121+:e368fdb8403d+) 8 | @@ -0,0 +1,77 @@ 9 | +package au.com.finsyn.acuritywebservices.build 10 | + 11 | +import org.apache.commons.io.FileUtils 12 | +import org.gradle.api.GradleException 13 | +import org.gradle.api.Project 14 | + 15 | +// If you're running IDEA 14.1.4, this class will be marked as in error with the message "Class already exists in 16 | +// package" or something of that sort. This is an IDEA bug (see https://youtrack.jetbrains.com/issue/IDEA-129535), and 17 | +// can be safely ignored. If you're in a later version of IDEA and you don't see any error, just delete this comment. 18 | +class IntegrationTestSetup implements Runnable { 19 | + 20 | + private static final String ENVIRONMENT_CONFIG_PROPERTIES_LOCATION = "environmentConfig.properties" 21 | + public static final String DEFAULT_DB_SERVER = "localhost" 22 | + 23 | + private final Project integrationTestProject 24 | + private final File environmentConfigPropertiesFile; 25 | + 26 | + private boolean hasRun = false; 27 | + 28 | + static IntegrationTestSetup forProject(Project integrationTestProject) { 29 | + return new IntegrationTestSetup(integrationTestProject) 30 | + } 31 | + 32 | + protected IntegrationTestSetup(Project integrationTestProject) { 33 | + this.integrationTestProject = integrationTestProject 34 | + 35 | + throwIfNotIntegrationTestProject(this.integrationTestProject) 36 | + 37 | + environmentConfigPropertiesFile = this.integrationTestProject.file(ENVIRONMENT_CONFIG_PROPERTIES_LOCATION) 38 | + } 39 | + 40 | + private static void throwIfNotIntegrationTestProject(Project project) { 41 | + if (!"integrationTest".equals(project.getName())) { 42 | + throw new GradleException("Attempted to perform integration test setup on a project that isn't the " + 43 | + "integration test project"); 44 | + } 45 | + } 46 | + 47 | + void run() { 48 | + 49 | + throwIfHasRun() 50 | + hasRun = true; 51 | + 52 | + Properties properties = loadProperties() 53 | + File environmentLocation = extractEnvironmentLocationOrThrow(properties) 54 | + String dbServer = extractDBServer(properties).orElse(DEFAULT_DB_SERVER) 55 | + String dbName = extractDBNameOrThrow(properties) 56 | + 57 | + throwIfInvalidEnvironment(environmentLocation) 58 | + throwIfAbsentDatabase(dbServer, dbName) 59 | + 60 | + // TODO find a way of getting these values into the testing environment 61 | + } 62 | + 63 | + private Properties loadProperties() { 64 | + throwIfConfigPropertiesFileAbsent() 65 | + 66 | + Properties properties = new Properties(); 67 | + properties.load(FileUtils.openInputStream(environmentConfigPropertiesFile)) 68 | + 69 | + return properties; 70 | + } 71 | + 72 | + private throwIfConfigPropertiesFileAbsent() { 73 | + if (!environmentConfigPropertiesFile.isFile()) { 74 | + throw new GradleException("Attempted to setup the integration tests without an " + 75 | + "environmentConfig.properties file. You need to add an environmentConfig.properties file into " + 76 | + "the integrationTest directory. There should be an example there already.") 77 | + } 78 | + } 79 | + 80 | + private void throwIfHasRun() { 81 | + if (hasRun) { 82 | + throw new IllegalStateException("Attempting to run integration test setup more than once") 83 | + } 84 | + } 85 | +} 86 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/keymaps/My Keymap.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | 87 | 88 | 89 | 90 | 91 | 92 | 93 | 94 | 95 | 96 | 97 | 98 | 99 | 100 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | -------------------------------------------------------------------------------- /$APP_CONFIG$/databaseDrivers.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 23 | 24 | 25 | 27 | 28 | 30 | 31 | 32 | 107 | -------------------------------------------------------------------------------- /$APP_CONFIG$/grepConsole.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 118 | 119 | -------------------------------------------------------------------------------- /$APP_CONFIG$/GrepConsole.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 123 | 124 | -------------------------------------------------------------------------------- /$APP_CONFIG$/toStringTemplates.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 40 | 41 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-71211.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/workbench/manage/model/ContributionDetailsTableModel.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/workbench/manage/model/ContributionDetailsTableModel.java (revision 27708:2a08672fee68ad503694015a4a0d06e1454f951d) 7 | +++ src/main/java/au/com/finsyn/workbench/manage/model/ContributionDetailsTableModel.java (revision 27708+:2a08672fee68+) 8 | @@ -67,10 +67,19 @@ 9 | super.setHibernateData(filteredList); 10 | } 11 | 12 | - public static boolean shouldDisplayContributionLine(ContributionLines c ) { 13 | + public static boolean shouldDisplayContributionLine(ContributionLines c ) { 14 | - return (!WorkbenchCommonUtils.isRefundedContributionLine(c) 15 | - && !WorkbenchCommonUtils.CONTRIBUTION_REFUND_RELATED_STATUS.contains(getContributionLineStatus(c))); 16 | + return !WorkbenchCommonUtils.isRefundedContributionLine(c) 17 | + && !ContributionLineStatuses.REFUNDED.getCode().equals(c.getFCz_Status()) 18 | + && !ContributionLineStatuses.REVERSING.getCode().equals(c.getFCz_Status()) 19 | + && !ContributionLineStatuses.REVERSED.getCode().equals(c.getFCz_Status()) 20 | + && !isDummyRefundingLine(c); 21 | + } 22 | + 23 | + public static boolean isDummyRefundingLine(ContributionLines fcLine) { 24 | + return fcLine.getFCz_Status().equals(ContributionLineStatuses.REFUNDING.getCode()) 25 | + && fcLine.getFCs_Orig_Sequence() != 0 26 | + && fcLine.getFCs_Orig_Sequence() != fcLine.getFCs_Sequence(); 27 | - } 28 | + } 29 | 30 | public DefaultTotalsTableModel getTotalsTableModel() { 31 | return totalsTableModel; 32 | Index: src/main/java/au/com/finsyn/workbench/manage/model/refund/RefundTableModel.java 33 | IDEA additional info: 34 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 35 | <+>windows-1252 36 | =================================================================== 37 | --- src/main/java/au/com/finsyn/workbench/manage/model/refund/RefundTableModel.java (revision 27708:2a08672fee68ad503694015a4a0d06e1454f951d) 38 | +++ src/main/java/au/com/finsyn/workbench/manage/model/refund/RefundTableModel.java (revision 27708+:2a08672fee68+) 39 | @@ -1,25 +1,5 @@ 40 | package au.com.finsyn.workbench.manage.model.refund; 41 | 42 | -import au.com.finsyn.swing.dialogs.Dialogs; 43 | -import jSSS.cdelegation.AcurityCommandGeneric; 44 | -import jSSS.cdelegation.AcurityCommandUpdate; 45 | -import jSSS.jcore.swing.worker.GenericTask; 46 | -import jSSS.jcore.swing.worker.TaskListener; 47 | -import jSSS.util.jSSSLogger; 48 | - 49 | -import java.lang.reflect.InvocationTargetException; 50 | -import java.math.BigDecimal; 51 | -import java.util.LinkedList; 52 | -import java.util.List; 53 | - 54 | -import javax.swing.JOptionPane; 55 | -import javax.swing.SwingUtilities; 56 | -import javax.swing.event.TableModelEvent; 57 | -import javax.swing.event.TableModelListener; 58 | -import javax.swing.table.TableModel; 59 | - 60 | -import org.apache.commons.beanutils.PropertyUtils; 61 | - 62 | import au.com.finsyn.formtools.SaveMarshall; 63 | import au.com.finsyn.formtools.SaveProviderHelper; 64 | import au.com.finsyn.hibernate.AcurityEntity; 65 | @@ -27,10 +7,25 @@ 66 | import au.com.finsyn.hibernate.tools.AbstractHibernateRowDataTableModel; 67 | import au.com.finsyn.hibernate.tools.RowDataInterface; 68 | import au.com.finsyn.hibernate.tools.RowDataReflectionGetterWithLookUp; 69 | +import au.com.finsyn.swing.dialogs.Dialogs; 70 | import au.com.finsyn.swing.tables.DefaultTotalsTableModel; 71 | import au.com.finsyn.workbench.manage.ContributionLineWithDerivedFields; 72 | import au.com.finsyn.xmlcustomisation.tables.XmlCustomisableTableModelSaveProvider; 73 | import au.com.finsyn.xmlcustomisation.tables.XmlTableCustomisation; 74 | +import jSSS.cdelegation.AcurityCommandGeneric; 75 | +import jSSS.cdelegation.AcurityCommandUpdate; 76 | +import jSSS.jcore.swing.worker.TaskListener; 77 | +import jSSS.util.jSSSLogger; 78 | +import org.apache.commons.beanutils.PropertyUtils; 79 | + 80 | +import javax.swing.*; 81 | +import javax.swing.event.TableModelEvent; 82 | +import javax.swing.event.TableModelListener; 83 | +import javax.swing.table.TableModel; 84 | +import java.lang.reflect.InvocationTargetException; 85 | +import java.math.BigDecimal; 86 | +import java.util.LinkedList; 87 | +import java.util.List; 88 | 89 | 90 | public class RefundTableModel extends XmlCustomisableTableModelSaveProvider 91 | Index: src/main/java/au/com/finsyn/workbench/manage/model/SearchOptionsModel.java 92 | IDEA additional info: 93 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 94 | <+>windows-1252 95 | =================================================================== 96 | --- src/main/java/au/com/finsyn/workbench/manage/model/SearchOptionsModel.java (revision 27708:2a08672fee68ad503694015a4a0d06e1454f951d) 97 | +++ src/main/java/au/com/finsyn/workbench/manage/model/SearchOptionsModel.java (revision 27708+:2a08672fee68+) 98 | @@ -8,6 +8,7 @@ 99 | import javax.swing.SwingUtilities; 100 | 101 | import org.apache.commons.lang3.StringUtils; 102 | +import org.hibernate.criterion.Conjunction; 103 | import org.hibernate.criterion.Criterion; 104 | import org.hibernate.criterion.DetachedCriteria; 105 | import org.hibernate.criterion.Junction; 106 | @@ -204,10 +205,12 @@ 107 | statusFilter.add(Restrictions.eq("FCz_Status", ContributionLineStatuses.MATCHED.getCode())); 108 | statusFilter.add(Restrictions.eq("FCz_Status", ContributionLineStatuses.UNMATCHED.getCode())); 109 | statusFilter.add(Restrictions.eq("FCz_Status", ContributionLineStatuses.MATCHED_STATIC_DATA_UNPROCESSED.getCode())); 110 | + statusFilter.add(nonDummyRefundingContributionsCriterion()); 111 | } 112 | if (isShowRejected()) 113 | { 114 | statusFilter.add(Restrictions.eq("FCz_Status", ContributionLineStatuses.REJECTED.getCode())); 115 | + statusFilter.add(nonDummyRefundingContributionsCriterion()); 116 | } 117 | 118 | DetachedCriteria subSelectForFilter = DetachedCriteria.forClass(ContributionLines.class); 119 | @@ -226,7 +229,7 @@ 120 | // FW has only FS lines with status Q 121 | 122 | Junction statusOrCriterion = Restrictions.disjunction(); 123 | - 124 | + 125 | statusOrCriterion.add(Property.forName("FWi_Identity").in(subSelectForFilter)) 126 | .add(Property.forName("FWi_Identity").in(subSelectForStaticDataStatus())) 127 | .add(Restrictions.and(Restrictions.isEmpty("contributionLines"), Restrictions.isEmpty("staticDataLines"))) 128 | @@ -246,8 +249,18 @@ 129 | criterion.add(statusOrCriterion); 130 | 131 | return criterion; 132 | + } 133 | + 134 | + private static Criterion nonDummyRefundingContributionsCriterion() { 135 | + 136 | + Conjunction isDummyRefundingRCLineCriterion = Restrictions.and( 137 | + Restrictions.eq("FCz_Status", "B"), 138 | + Restrictions.ne("FCs_Orig_Sequence", 0), 139 | + Restrictions.neProperty("FCs_Orig_Sequence", "FCs_Sequence")); 140 | + 141 | + return Restrictions.not(isDummyRefundingRCLineCriterion); 142 | } 143 | - 144 | + 145 | private DetachedCriteria subSelectForStaticDataRecordWithIsNotStatusQ() 146 | { 147 | DetachedCriteria subSelectForFilter = DetachedCriteria.forClass(StaticDataLines.class); 148 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-7945__Fix_AIS_unit_and_integration_tests__-_Add_Logging_output_stream_to_gradle_plugin.patch: -------------------------------------------------------------------------------- 1 | Index: ../../.hgignore 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- ../../.hgignore (revision 30138:44b16ab20c4b2d497616ed3306c2796a48e28f82) 7 | +++ ../../.hgignore (revision 30138+:44b16ab20c4b+) 8 | @@ -6,6 +6,7 @@ 9 | # use glob syntax. 10 | syntax: glob 11 | 12 | +srcjava/nativeProjects/build 13 | srcjava/masterProject/buildSrc/build 14 | srcjava/AcurityWebServices/.* 15 | srcjava/AcurityWebServices/build 16 | Index: ../nativeProjects/build.gradle 17 | IDEA additional info: 18 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 19 | <+>windows-1252 20 | =================================================================== 21 | --- ../nativeProjects/build.gradle (revision 30138+:44b16ab20c4b+) 22 | +++ ../nativeProjects/build.gradle (revision 30138+:44b16ab20c4b+) 23 | @@ -0,0 +1,219 @@ 24 | +import au.com.finsyn.gradlecommonplugin.DevNull 25 | +import au.com.finsyn.gradlecommonplugin.VisualStudioFinder 26 | + 27 | +def msBuildBinaryLocation = VisualStudioFinder.findMSBuildBinary(project).absolutePath 28 | + 29 | +buildscript { 30 | + repositories { 31 | + maven { url 'http://fspc143:8081/artifactory/repo' } 32 | + } 33 | + 34 | + dependencies { 35 | + classpath 'au.com.finsyn:gradle-common-plugin:1.0.0-SNAPSHOT' 36 | + } 37 | + 38 | + configurations.all { 39 | + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' 40 | + } 41 | +} 42 | + 43 | +apply plugin: 'au.com.finsyn.gradlecommonplugin' 44 | + 45 | +buildDir = file('build') 46 | +File nativeArtifactsDir = new File(buildDir, 'nativeArtifacts') 47 | + 48 | +File checkoutRootDir = file('../..') 49 | + 50 | +File header_location = new File(checkoutRootDir, 'inc/dat') 51 | +File xtr_location = new File(checkoutRootDir, 'xtr') 52 | +File release_source_location = new File(checkoutRootDir, 'release/src') 53 | +File sys_var_location = new File(checkoutRootDir, 'inc/sys_var.h') 54 | +File z_file_location = new File(checkoutRootDir, 'inc') 55 | + 56 | +File utilsLocation = new File(checkoutRootDir, 'utils') 57 | + 58 | +File makeDDFExeLocation = new File(utilsLocation, '/make_ddf_cvs.exe') 59 | +File makeDDFSourceLocation = new File(utilsLocation, '/make_ddf_cvs') 60 | +File makeDDFSolutionLocation = new File(makeDDFSourceLocation, '/make_ddf_cvs.vcxproj') 61 | + 62 | +task makeMakeDDFUtility(type: Exec, group: 'build') { 63 | + inputs.files(fileTree(makeDDFSourceLocation).include('**/*.c')) 64 | + outputs.files(makeDDFExeLocation) 65 | + 66 | + executable = msBuildBinaryLocation 67 | + 68 | + args = [makeDDFSolutionLocation, '/target:rebuild'] 69 | + 70 | + // Necessary to avoid an issue when running in cygwin 71 | + environment.remove("tmp") 72 | + environment.remove("TMP") 73 | + environment.remove("temp") 74 | + environment.remove("TEMP") 75 | + 76 | + standardOutput = DevNull.output() 77 | +} 78 | + 79 | +task cleanMakeDDFUtility(type: Exec, group: 'build') { 80 | + executable = msBuildBinaryLocation 81 | + 82 | + args = [makeDDFSolutionLocation, '/target:clean'] 83 | + 84 | + // Necessary to avoid an issue when running in cygwin 85 | + environment.remove("tmp") 86 | + environment.remove("TMP") 87 | + environment.remove("temp") 88 | + environment.remove("TEMP") 89 | + 90 | + standardOutput = DevNull.output() 91 | +} 92 | + 93 | +task copyMakeDDFUtility(type: Copy, group: 'build') { 94 | + mustRunAfter makeMakeDDFUtility 95 | + 96 | + from makeDDFExeLocation 97 | + into nativeArtifactsDir 98 | +} 99 | + 100 | +task buildMakeDDFUtility(group: 'build') { 101 | + dependsOn makeMakeDDFUtility, copyMakeDDFUtility 102 | +} 103 | + 104 | +task makeXTRDir(group: 'build') << { 105 | + xtr_location.mkdirs() 106 | +} 107 | + 108 | +task regenerateZFiles(type: Exec, group: 'build') { 109 | + dependsOn(buildMakeDDFUtility, makeXTRDir) 110 | + 111 | + inputs.files( 112 | + makeDDFExeLocation, 113 | + header_location, 114 | + release_source_location, 115 | + sys_var_location 116 | + ) 117 | + outputs.files(z_file_location) 118 | + 119 | + workingDir = file(utilsLocation) 120 | + 121 | + executable = file(makeDDFExeLocation).absolutePath 122 | + 123 | + args = [ 124 | + 'FULL-DIAGRAMS', 125 | + header_location.absolutePath, 126 | + xtr_location.absolutePath, 127 | + release_source_location.absolutePath, 128 | + sys_var_location.absolutePath 129 | + ] 130 | + 131 | + standardOutput = DevNull.output() 132 | +} 133 | + 134 | +def btrieveBuilderName = "build_btv.bat" 135 | + 136 | +task regenerateExtraBtrieveFiles(type: Exec, group: 'build') { 137 | + mustRunAfter(regenerateZFiles) 138 | + 139 | + workingDir = utilsLocation 140 | + 141 | + commandLine 'cmd', '/c', btrieveBuilderName 142 | + 143 | + inputs.dir "$z_file_location/btv" 144 | + inputs.file "$utilsLocation/$btrieveBuilderName" 145 | + 146 | + outputs.files new File(xtr_location, 'dfmax.dat'), 147 | + new File(xtr_location, 'dfmatx.dat'), 148 | + new File(xtr_location, 'dfax.dat'), 149 | + new File(xtr_location, 'dfatx.dat'), 150 | + new File(xtr_location, 'datxfm.dat'), 151 | + new File(xtr_location, 'datxf.dat'), 152 | + new File(xtr_location, 'datx.dat'), 153 | + new File(xtr_location, 'datfx.dat'), 154 | + new File(xtr_location, 'datfmx.dat') 155 | + 156 | + standardOutput = DevNull.output() 157 | +} 158 | + 159 | +task regenerateHeaders(group: 'build') { 160 | + dependsOn(regenerateZFiles, regenerateExtraBtrieveFiles) 161 | +} 162 | + 163 | +def msgcodeSDFLocation = new File(utilsLocation, 'msgcode_sdf') 164 | + 165 | +task compileMsgcodeSDFProcessor(type: Exec, group: 'build') { 166 | + workingDir msgcodeSDFLocation 167 | + 168 | + commandLine 'cmd', '/c', 'make.bat' 169 | + 170 | + inputs.files new File(msgcodeSDFLocation, 'MsgcodeRecord.java'), 171 | + new File(msgcodeSDFLocation, 'MsgcodeSdfCreator.java'), 172 | + new File(msgcodeSDFLocation, 'MsgcodeSdfProcessor.java') 173 | + 174 | + outputs.files new File(msgcodeSDFLocation, 'MsgcodeRecord.class'), 175 | + new File(msgcodeSDFLocation, 'MsgcodeSdfCreator.class'), 176 | + new File(msgcodeSDFLocation, 'MsgcodeSdfProcessor.class') 177 | + 178 | + standardOutput = DevNull.output() 179 | +} 180 | + 181 | +task updateSWVersion(type: Exec, group: 'build') { 182 | + workingDir utilsLocation 183 | + 184 | + commandLine 'cmd', '/c', 'update_software_version.bat', checkoutRootDir.absolutePath 185 | + 186 | + // TODO define inputs and outputs 187 | +} 188 | + 189 | +task regenSSSErrHeader(type: JavaExec, group: 'build', dependsOn: compileMsgcodeSDFProcessor) { 190 | + mustRunAfter compileMsgcodeSDFProcessor 191 | + 192 | + classpath msgcodeSDFLocation 193 | + 194 | + main = 'MsgcodeSdfProcessor' 195 | + 196 | + args checkoutRootDir.absolutePath 197 | +} 198 | + 199 | +def ssbDLLSourceLocation = new File(checkoutRootDir, 'srccpp/AcuritySSBDLL') 200 | +def ssbDLLSolutionLocation = new File(ssbDLLSourceLocation, 'AcuritySSBDLL2010.sln') 201 | +def builtSSBDLLLocation = new File(ssbDLLSourceLocation, 'Debug/ssb.dll') 202 | + 203 | +task makeSSBDLL(type: Exec, group: 'build') { 204 | + dependsOn regenSSSErrHeader, regenerateHeaders, updateSWVersion 205 | + 206 | + executable = msBuildBinaryLocation 207 | + 208 | + args = [ssbDLLSolutionLocation, '/target:rebuild', '/p:Configuration=Debug'] 209 | + 210 | + // Necessary to avoid an issue when running in cygwin 211 | + environment.remove("tmp") 212 | + environment.remove("TMP") 213 | + environment.remove("temp") 214 | + environment.remove("TEMP") 215 | +} 216 | + 217 | +task cleanSSBDLL(type: Exec, group: 'build') { 218 | + executable = msBuildBinaryLocation 219 | + 220 | + args = [ssbDLLSolutionLocation, '/target:clean'] 221 | +} 222 | + 223 | +task copySSBDLL(type: Copy, group: 'build') { 224 | + mustRunAfter makeSSBDLL 225 | + 226 | + from builtSSBDLLLocation 227 | + into nativeArtifactsDir 228 | +} 229 | + 230 | +task buildSSBDLL(group: 'build') { 231 | + dependsOn makeSSBDLL, copySSBDLL 232 | +} 233 | + 234 | +task buildAll(group: 'build') { 235 | + dependsOn updateSWVersion, buildSSBDLL, buildMakeDDFUtility, regenerateHeaders 236 | +} 237 | + 238 | +task cleanAll(type: Delete, group: 'other') { 239 | + dependsOn cleanMakeDDFUtility, cleanSSBDLL 240 | + 241 | + delete buildDir 242 | +} 243 | \ No newline at end of file 244 | -------------------------------------------------------------------------------- /$APP_CONFIG$/project.default.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 35 | 38 | 39 | 40 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | 74 | 75 | 81 | 82 | 83 | 96 | 97 | 98 | 99 | 113 | 114 | 115 | 116 | 117 | 118 | 125 | 126 | 127 | 128 | 146 | 153 | 154 | 155 | 160 | 163 | 164 | 165 | 167 | 168 | 169 | 170 | 171 | 1.7 172 | 173 | 178 | 179 | 180 | 181 | 182 | 183 | 184 | 185 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-7607__Work_test_identified_functionality_gaps_-_java_changes__-_Fix_issue_when_setting_.patch: -------------------------------------------------------------------------------- 1 | Index: ../finsynCommons/src/main/java/au/com/finsyn/i18n/C10NProvider.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- ../finsynCommons/src/main/java/au/com/finsyn/i18n/C10NProvider.java (revision 30357+:74eeb64d8cfc+) 7 | +++ ../finsynCommons/src/main/java/au/com/finsyn/i18n/C10NProvider.java (revision 30357+:74eeb64d8cfc+) 8 | @@ -0,0 +1,10 @@ 9 | +package au.com.finsyn.i18n; 10 | + 11 | +import javax.annotation.ParametersAreNonnullByDefault; 12 | + 13 | +@ParametersAreNonnullByDefault 14 | +public class C10NProvider { 15 | + 16 | + 17 | + 18 | +} 19 | Index: ../finsynCommons/build.gradle 20 | IDEA additional info: 21 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 22 | <+>windows-1252 23 | =================================================================== 24 | --- ../finsynCommons/build.gradle (revision 30357:74eeb64d8cfc782747a56bda35755db2f89483cc) 25 | +++ ../finsynCommons/build.gradle (revision 30357+:74eeb64d8cfc+) 26 | @@ -37,6 +37,8 @@ 27 | 28 | compile 'org.slf4j:slf4j-api:1.7.12' 29 | 30 | + compile 'com.github.rodionmoiseev.c10n:c10n-core:1.2' 31 | + 32 | compile group: 'junit', name: 'junit', version: '4.11' 33 | } 34 | 35 | \ No newline at end of file 36 | Index: ../finsynCommons/src/main/resources/au/com/finsyn/i18n/FinsynCommonsMessages.properties 37 | IDEA additional info: 38 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 39 | <+>windows-1252 40 | =================================================================== 41 | --- ../finsynCommons/src/main/resources/au/com/finsyn/i18n/FinsynCommonsMessages.properties (revision 30357+:74eeb64d8cfc+) 42 | +++ ../finsynCommons/src/main/resources/au/com/finsyn/i18n/FinsynCommonsMessages.properties (revision 30357+:74eeb64d8cfc+) 43 | @@ -0,0 +1,2 @@ 44 | +au.com.finsyn.i18n.FinsynCommonsMessages.ascending = Ascending 45 | +au.com.finsyn.i18n.FinsynCommonsMessages.descending = Descending 46 | \ No newline at end of file 47 | Index: ../finsynCommons/src/main/java/au/com/finsyn/i18n/FinsynCommonsMessages.java 48 | IDEA additional info: 49 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 50 | <+>windows-1252 51 | =================================================================== 52 | --- ../finsynCommons/src/main/java/au/com/finsyn/i18n/FinsynCommonsMessages.java (revision 30357+:74eeb64d8cfc+) 53 | +++ ../finsynCommons/src/main/java/au/com/finsyn/i18n/FinsynCommonsMessages.java (revision 30357+:74eeb64d8cfc+) 54 | @@ -0,0 +1,22 @@ 55 | +package au.com.finsyn.i18n; 56 | + 57 | +import com.github.rodionmoiseev.c10n.C10N; 58 | +import com.github.rodionmoiseev.c10n.C10NMessages; 59 | + 60 | +import java.util.Locale; 61 | + 62 | +@C10NMessages 63 | +public interface FinsynCommonsMessages { 64 | + 65 | + static FinsynCommonsMessages get() { 66 | + return C10N.get(FinsynCommonsMessages.class); 67 | + } 68 | + 69 | + static FinsynCommonsMessages get(Locale locale) { 70 | + return C10N.get(FinsynCommonsMessages.class, locale); 71 | + } 72 | + 73 | + String ascending(); 74 | + 75 | + String descending(); 76 | +} 77 | Index: ../finsynCommons/src/main/java/au/com/finsyn/hibernate/tools/SortOrder.java 78 | IDEA additional info: 79 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 80 | <+>windows-1252 81 | =================================================================== 82 | --- ../finsynCommons/src/main/java/au/com/finsyn/hibernate/tools/SortOrder.java (revision 30357:74eeb64d8cfc782747a56bda35755db2f89483cc) 83 | +++ ../finsynCommons/src/main/java/au/com/finsyn/hibernate/tools/SortOrder.java (revision 30357+:74eeb64d8cfc+) 84 | @@ -1,6 +1,8 @@ 85 | package au.com.finsyn.hibernate.tools; 86 | 87 | -import javax.annotation.ParametersAreNonnullByDefault; 88 | +import au.com.finsyn.i18n.FinsynCommonsMessages; 89 | +import com.github.rodionmoiseev.c10n.C10N; 90 | + 91 | import java.util.Objects; 92 | 93 | public enum SortOrder { 94 | @@ -20,13 +22,15 @@ 95 | } 96 | 97 | public String render() { 98 | + FinsynCommonsMessages messages = C10N.get(FinsynCommonsMessages.class); 99 | + 100 | switch (this) { 101 | case ASCENDING: 102 | - return "Ascending"; 103 | + return messages.ascending(); 104 | case DESCENDING: 105 | - return "Descending"; 106 | + return messages.descending(); 107 | default: 108 | - return this.toString(); 109 | + throw new UnexpectedSortOrderException(this); 110 | } 111 | } 112 | 113 | @@ -36,9 +40,9 @@ 114 | return DESCENDING; 115 | case DESCENDING: 116 | return ASCENDING; 117 | + default: 118 | + throw new UnexpectedSortOrderException(this); 119 | } 120 | - throw new AssertionError("Encountered " + SortOrder.class.getName() + " that was neither " + ASCENDING 121 | - + " nor " + DESCENDING); 122 | } 123 | 124 | public static SortOrder fromAscending(boolean isAscending) { 125 | @@ -54,5 +58,12 @@ 126 | */ 127 | public static SortOrder theDefault() { 128 | return ASCENDING; 129 | + } 130 | + 131 | + public class UnexpectedSortOrderException extends RuntimeException { 132 | + protected UnexpectedSortOrderException(SortOrder unexpected) { 133 | + super("Encountered " + SortOrder.class.getName() + " instance of type " + unexpected + " that was neither " 134 | + + ASCENDING + " nor " + DESCENDING); 135 | + } 136 | } 137 | } 138 | Index: ../finsynCommons/src/test/java/au/com/finsyn/hibernate/tools/SortOrderTest.java 139 | IDEA additional info: 140 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 141 | <+>windows-1252 142 | =================================================================== 143 | --- ../finsynCommons/src/test/java/au/com/finsyn/hibernate/tools/SortOrderTest.java (revision 30357+:74eeb64d8cfc+) 144 | +++ ../finsynCommons/src/test/java/au/com/finsyn/hibernate/tools/SortOrderTest.java (revision 30357+:74eeb64d8cfc+) 145 | @@ -0,0 +1,48 @@ 146 | +package au.com.finsyn.hibernate.tools; 147 | + 148 | +import org.junit.Test; 149 | + 150 | +import static au.com.finsyn.hibernate.tools.SortOrder.ASCENDING; 151 | +import static au.com.finsyn.hibernate.tools.SortOrder.DESCENDING; 152 | +import static au.com.finsyn.hibernate.tools.SortOrder.fromAscending; 153 | +import static au.com.finsyn.hibernate.tools.SortOrder.fromDescending; 154 | +import static au.com.finsyn.hibernate.tools.SortOrder.theDefault; 155 | +import static org.junit.Assert.assertEquals; 156 | + 157 | +public class SortOrderTest { 158 | + 159 | + @Test 160 | + public void testGetSqlCode() throws Exception { 161 | + assertEquals("ASC", ASCENDING.getSqlCode()); 162 | + assertEquals("DESC", DESCENDING.getSqlCode()); 163 | + } 164 | + 165 | + @Test 166 | + public void testRender() throws Exception { 167 | + assertEquals("Ascending", ASCENDING.render()); 168 | + assertEquals("Descending", DESCENDING.render()); 169 | + } 170 | + 171 | + @Test 172 | + public void testInvert() throws Exception { 173 | + assertEquals(DESCENDING, ASCENDING.invert()); 174 | + assertEquals(ASCENDING, DESCENDING.invert()); 175 | + } 176 | + 177 | + @Test 178 | + public void testFromAscending() throws Exception { 179 | + assertEquals(ASCENDING, fromAscending(true)); 180 | + assertEquals(DESCENDING, fromAscending(false)); 181 | + } 182 | + 183 | + @Test 184 | + public void testFromDescending() throws Exception { 185 | + assertEquals(ASCENDING, fromDescending(false)); 186 | + assertEquals(DESCENDING, fromDescending(true)); 187 | + } 188 | + 189 | + @Test 190 | + public void testTheDefault() throws Exception { 191 | + assertEquals(ASCENDING, theDefault()); 192 | + } 193 | +} 194 | \ No newline at end of file 195 | Index: ../finsynCommons/src/test/java/au/com/finsyn/i18n/C10NTest.java 196 | IDEA additional info: 197 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 198 | <+>windows-1252 199 | =================================================================== 200 | --- ../finsynCommons/src/test/java/au/com/finsyn/i18n/C10NTest.java (revision 30357+:74eeb64d8cfc+) 201 | +++ ../finsynCommons/src/test/java/au/com/finsyn/i18n/C10NTest.java (revision 30357+:74eeb64d8cfc+) 202 | @@ -0,0 +1,33 @@ 203 | +package au.com.finsyn.i18n; 204 | + 205 | +import com.github.rodionmoiseev.c10n.C10N; 206 | +import com.github.rodionmoiseev.c10n.C10NConfigBase; 207 | +import org.junit.Before; 208 | +import org.junit.Test; 209 | + 210 | +import static org.junit.Assert.assertEquals; 211 | +import static org.junit.Assert.assertNotSame; 212 | + 213 | +// TODO fix up this test 214 | +public class C10NTest { 215 | + 216 | + @Before 217 | + public void setUp() throws Exception { 218 | + C10N.configure(new C10NConfigBase() { 219 | + @Override 220 | + protected void configure() { 221 | + bindBundle(FinsynCommonsMessages.class.getName()); 222 | + } 223 | + }); 224 | + } 225 | + 226 | + @Test 227 | + public void testC10NNoCache() throws Exception { 228 | + FinsynCommonsMessages firstMessagesInstance = C10N.get(FinsynCommonsMessages.class); 229 | + FinsynCommonsMessages secondMessagesInstance = C10N.get(FinsynCommonsMessages.class); 230 | + 231 | + assertEquals("Ascending", firstMessagesInstance.ascending()); 232 | + 233 | + assertNotSame(firstMessagesInstance, secondMessagesInstance); 234 | + } 235 | +} 236 | \ No newline at end of file 237 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/SR-7831__Event_Management_-_Grid_row_select_bug.patch: -------------------------------------------------------------------------------- 1 | Index: src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/model/EventActionContextTableModel.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/model/EventActionContextTableModel.java (revision 27869:b12a77cd77a89d000bfc2a5c52ea7d79d6d5f67f) 7 | +++ src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/model/EventActionContextTableModel.java (revision 27869+:b12a77cd77a8+) 8 | @@ -180,4 +180,8 @@ 9 | public ReadOnlyProperty eventActionContextProperty() { 10 | return eventActionContext; 11 | } 12 | + 13 | + public EventDefinitions getEventDefinition() { 14 | + return eventDefinition; 15 | + } 16 | } 17 | Index: src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventActionContextTable.java 18 | IDEA additional info: 19 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 20 | <+>windows-1252 21 | =================================================================== 22 | --- src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventActionContextTable.java (revision 27869:b12a77cd77a89d000bfc2a5c52ea7d79d6d5f67f) 23 | +++ src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventActionContextTable.java (revision 27869+:b12a77cd77a8+) 24 | @@ -9,15 +9,17 @@ 25 | import au.com.finsyn.swing.tables.ComponentWithPopupMenuInterface; 26 | import au.com.finsyn.swing.tables.FitChildJScrollPane; 27 | import au.com.finsyn.swing.tables.PopupMouse; 28 | +import au.com.finsyn.swing.tables.TableSupport; 29 | import au.com.finsyn.swing.tables.TableUtils; 30 | import au.com.finsyn.swing.tables.cellrenders.BatchCodeCellRenderer; 31 | import au.com.finsyn.swing.tables.cellrenders.CheckBoxCellRenderer.YesNoCheckBoxCellRenderer; 32 | import au.com.finsyn.swing.tables.cellrenders.CodeAndDescriptionCellRenderer; 33 | import au.com.finsyn.swing.tables.cellrenders.ReportGroupTypeCellRenderer; 34 | +import au.com.finsyn.swing.tables.cellrenders.RightAlignedTableCellRenderer; 35 | import au.com.finsyn.swing.util.WebColour; 36 | import au.com.finsyn.swing.util.listenerhelpers.TableColumnAddedListener.SetRendererAsTableColumnAddedListener; 37 | -import au.com.finsyn.util.entities.codesanddescriptions.CodesAndDescriptionEnum; 38 | import au.com.finsyn.util.ComparatorUtils; 39 | +import au.com.finsyn.util.entities.codesanddescriptions.CodesAndDescriptionEnum; 40 | import com.jidesoft.grid.AutoFilterTableHeader; 41 | import com.jidesoft.grid.CellStyle; 42 | import com.jidesoft.grid.ISortableTableModel; 43 | @@ -25,7 +27,6 @@ 44 | import com.jidesoft.grid.SortableTableModel; 45 | import com.jidesoft.grid.StyleModel; 46 | import com.jidesoft.grid.TableModelWrapperUtils; 47 | -import au.com.finsyn.swing.tables.cellrenders.RightAlignedTableCellRenderer; 48 | import jSSS.util.GuiUtil; 49 | import javafx.collections.ListChangeListener; 50 | 51 | @@ -49,7 +50,7 @@ 52 | * @author timothym 53 | */ 54 | public class EventActionContextTable extends SortableTable implements ColumnWidthPreferenceInterface, StyleModel, 55 | - ComponentWithPopupMenuInterface { 56 | + ComponentWithPopupMenuInterface, TableSupport { 57 | 58 | private ColumnWidthPreferenceHelper widthPreferenceHelper = new ColumnWidthPreferenceHelper(this); 59 | private final EventManagementStateBundle stateBundle; 60 | Index: src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventsTable.java 61 | IDEA additional info: 62 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 63 | <+>windows-1252 64 | =================================================================== 65 | --- src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventsTable.java (revision 27869:b12a77cd77a89d000bfc2a5c52ea7d79d6d5f67f) 66 | +++ src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventsTable.java (revision 27869+:b12a77cd77a8+) 67 | @@ -13,27 +13,33 @@ 68 | import au.com.finsyn.swing.tables.TableUtils; 69 | import au.com.finsyn.swing.tables.cellrenders.CodeAndDescriptionCellRenderer; 70 | import au.com.finsyn.swing.tables.cellrenders.KeyValueCellRenderer; 71 | +import au.com.finsyn.swing.tables.cellrenders.RightAlignedTableCellRenderer; 72 | import au.com.finsyn.swing.tables.cellrenders.ToStringCellRenderer; 73 | import au.com.finsyn.swing.util.listenerhelpers.TableColumnAddedListener.SetRendererAsTableColumnAddedListener; 74 | -import au.com.finsyn.util.entities.codesanddescriptions.CodesAndDescriptionEnum; 75 | +import au.com.finsyn.util.SystemStreamUtils; 76 | import au.com.finsyn.util.datastructures.CollectionUtils; 77 | import au.com.finsyn.util.datastructures.FlyweightMap; 78 | +import au.com.finsyn.util.entities.codesanddescriptions.CodesAndDescriptionEnum; 79 | import com.jidesoft.grid.HierarchicalTable; 80 | import com.jidesoft.grid.HierarchicalTableComponentFactory; 81 | import com.jidesoft.grid.JideTable; 82 | import com.jidesoft.grid.RowStripeTableStyleProvider; 83 | import com.jidesoft.grid.TableModelWrapperUtils; 84 | -import au.com.finsyn.swing.tables.cellrenders.RightAlignedTableCellRenderer; 85 | 86 | import javax.swing.JPopupMenu; 87 | import javax.swing.ListSelectionModel; 88 | import javax.swing.SwingUtilities; 89 | +import javax.swing.event.ListSelectionEvent; 90 | +import javax.swing.event.ListSelectionListener; 91 | import javax.swing.table.TableCellRenderer; 92 | import javax.swing.table.TableColumn; 93 | import java.awt.Color; 94 | import java.awt.Component; 95 | import java.awt.Dimension; 96 | import java.awt.Font; 97 | +import java.time.LocalTime; 98 | +import java.util.HashMap; 99 | +import java.util.Map; 100 | import java.util.Objects; 101 | import java.util.Optional; 102 | import java.util.stream.Collectors; 103 | @@ -48,13 +54,16 @@ 104 | 105 | private static final Color ROW_BACKGROUND = Color.WHITE; 106 | 107 | - private ColumnWidthPreferenceHelper widthPreferenceHelper = new ColumnWidthPreferenceHelper(this); 108 | private FlyweightMap contextTableModels = 109 | new FlyweightMap<>(event -> new EventActionContextTableModel( 110 | this.stateBundle, 111 | event, 112 | this.getActualModel().currentContextProperty())); 113 | 114 | + private ColumnWidthPreferenceHelper widthPreferenceHelper = new ColumnWidthPreferenceHelper(this); 115 | + 116 | + private Map actionTables = new HashMap<>(); 117 | + 118 | private EventManagementStateBundle stateBundle; 119 | 120 | private EventsTablePopupMenu popupMenu; 121 | @@ -97,18 +106,58 @@ 122 | 123 | @Override 124 | public Component createChildComponent(HierarchicalTable table, Object value, int row) { 125 | - EventActionTablePanel returnedPanel = new EventActionTablePanel( 126 | - this.contextTableModels.get(this.getActualModel().getElementAt(row)), 127 | - this.getCellStyleAt(row, 0).getBackground(), this.stateBundle); 128 | 129 | + EventActionContextTableModel matchingTableModel = 130 | + this.contextTableModels.get(this.getActualModel().getElementAt(row)); 131 | + 132 | + Color backgroundColor = this.getCellStyleAt(row, 0).getBackground(); 133 | + 134 | + EventActionTablePanel returnedPanel = new EventActionTablePanel(matchingTableModel, backgroundColor, 135 | + this.stateBundle); 136 | + 137 | + registerActionTable(returnedPanel.getTable()); 138 | + 139 | SwingUtilities.invokeLater(this::resizeAndRepaint); 140 | 141 | return returnedPanel; 142 | } 143 | 144 | + private void registerActionTable(EventActionContextTable actionTable) { 145 | + ListSelectionListener listSelectionListener = event -> handleContextTableSelectionChange(event, actionTable); 146 | + actionTable.getSelectionModel().addListSelectionListener(listSelectionListener); 147 | + 148 | + actionTables.put(actionTable, listSelectionListener); 149 | + } 150 | + 151 | + private void handleContextTableSelectionChange(ListSelectionEvent event, EventActionContextTable actionTable) { 152 | + 153 | + SystemStreamUtils.printDebugInfo( 154 | + "event", event, 155 | + "event code", actionTable.getActualModel().getEventDefinition().getEVz_EventCode(), 156 | + "time", LocalTime.now()); 157 | + 158 | + if (event.getFirstIndex() >= 0) { 159 | + System.err.println("Clears tables at " + LocalTime.now()); 160 | + actionTables.keySet().forEach(table -> { 161 | + if (table != actionTable) { 162 | + table.clearSelection(); 163 | + } 164 | + }); 165 | + } 166 | + } 167 | + 168 | + private void unRegisterActionTable(EventActionContextTable actionTable) { 169 | + ListSelectionListener listSelectionListener = actionTables.get(actionTable); 170 | + actionTable.getSelectionModel().removeListSelectionListener(listSelectionListener); 171 | + 172 | + actionTables.remove(actionTable); 173 | + } 174 | + 175 | @Override 176 | - public void destroyChildComponent(HierarchicalTable hierarchicalTable, Component component, int i) { 177 | - // Do nothing 178 | + public void destroyChildComponent(HierarchicalTable hierarchicalTable, Component component, int row) { 179 | + EventActionContextTable tableToUnRegister = ((EventActionTablePanel) component).getTable(); 180 | + 181 | + unRegisterActionTable(tableToUnRegister); 182 | } 183 | 184 | private void initRenderers() { 185 | Index: src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventActionTablePanel.java 186 | IDEA additional info: 187 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 188 | <+>windows-1252 189 | =================================================================== 190 | --- src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventActionTablePanel.java (revision 27869:b12a77cd77a89d000bfc2a5c52ea7d79d6d5f67f) 191 | +++ src/main/java/au/com/finsyn/forms/eventsandexceptions/eventmanagement/view/EventActionTablePanel.java (revision 27869+:b12a77cd77a8+) 192 | @@ -23,6 +23,7 @@ 193 | private JPanel overlayPanel; 194 | private JLabel noResultsLbl; 195 | private FitChildJScrollPane tableScrollPane; 196 | + private EventActionContextTable table; 197 | 198 | public EventActionTablePanel(EventActionContextTableModel tableModel, Color backgroundColor, 199 | EventManagementStateBundle stateBundle) { 200 | @@ -31,40 +32,45 @@ 201 | this.backgroundColor = backgroundColor; 202 | this.stateBundle = stateBundle; 203 | 204 | - this.init(); 205 | - this.initListeners(); 206 | + init(); 207 | + initListeners(); 208 | } 209 | 210 | private void init() { 211 | - this.overlayPanel = new JPanel(); 212 | - this.overlayPanel.setLayout(new OverlayLayout(overlayPanel)); 213 | + overlayPanel = new JPanel(); 214 | + overlayPanel.setLayout(new OverlayLayout(overlayPanel)); 215 | 216 | - this.tableScrollPane = new FitChildJScrollPane(new EventActionContextTable(this.tableModel, this.stateBundle) 217 | + table = new EventActionContextTable(tableModel, stateBundle); 218 | + tableScrollPane = new FitChildJScrollPane(table 219 | .setPreferredHeightWhenEmpty(50)); 220 | 221 | - this.noResultsLbl = new JLabel("No Actions"); 222 | - this.noResultsLbl.setFont(this.noResultsLbl.getFont().deriveFont(Font.BOLD)); 223 | - this.noResultsLbl.setAlignmentX(0.5f); 224 | - this.noResultsLbl.setAlignmentY(0.7f); 225 | + noResultsLbl = new JLabel("No Actions"); 226 | + noResultsLbl.setFont(noResultsLbl.getFont().deriveFont(Font.BOLD)); 227 | + noResultsLbl.setAlignmentX(0.5f); 228 | + noResultsLbl.setAlignmentY(0.7f); 229 | 230 | - this.setBackground(backgroundColor); 231 | - this.setComponent(overlayPanel); 232 | + setBackground(backgroundColor); 233 | + setComponent(overlayPanel); 234 | 235 | - this.refreshOverlayPanel(); 236 | + refreshOverlayPanel(); 237 | } 238 | 239 | private void initListeners() { 240 | - this.tableModel.addTableModelListener(event -> this.refreshOverlayPanel()); 241 | + tableModel.addTableModelListener(event -> refreshOverlayPanel()); 242 | } 243 | 244 | private void refreshOverlayPanel() { 245 | - this.overlayPanel.removeAll(); 246 | + overlayPanel.removeAll(); 247 | 248 | - if (this.tableModel.getRowCount() == 0) { 249 | - this.overlayPanel.add(this.noResultsLbl); 250 | + if (tableModel.getRowCount() == 0) { 251 | + overlayPanel.add(noResultsLbl); 252 | } 253 | - this.overlayPanel.add(this.tableScrollPane); 254 | + overlayPanel.add(tableScrollPane); 255 | 256 | - this.overlayPanel.repaint(); 257 | + overlayPanel.repaint(); 258 | + } 259 | + 260 | + public EventActionContextTable getTable() { 261 | + return table; 262 | } 263 | } 264 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/inspection/My Inspections.xml: -------------------------------------------------------------------------------- 1 | 2 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/shelf/unnamed.patch: -------------------------------------------------------------------------------- 1 | Index: src/test/java/au/com/finsyn/i18n/I18NTest.java 2 | IDEA additional info: 3 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 4 | <+>windows-1252 5 | =================================================================== 6 | --- src/test/java/au/com/finsyn/i18n/I18NTest.java (revision 30357+:74eeb64d8cfc+) 7 | +++ src/test/java/au/com/finsyn/i18n/I18NTest.java (revision 30357+:74eeb64d8cfc+) 8 | @@ -0,0 +1,80 @@ 9 | +package au.com.finsyn.i18n; 10 | + 11 | +import com.github.rodionmoiseev.c10n.C10N; 12 | +import com.github.rodionmoiseev.c10n.C10NConfigBase; 13 | +import com.github.rodionmoiseev.c10n.C10NMessages; 14 | +import com.github.rodionmoiseev.c10n.C10NMsgFactory; 15 | +import com.github.rodionmoiseev.c10n.annotations.En; 16 | +import com.github.rodionmoiseev.c10n.annotations.Fr; 17 | +import org.junit.After; 18 | +import org.junit.Before; 19 | +import org.junit.Test; 20 | + 21 | +import java.util.Locale; 22 | + 23 | +import static org.junit.Assert.*; 24 | + 25 | +public class I18NTest { 26 | + 27 | + @Before 28 | + public void setUp() throws Exception { 29 | + I18N.HELPER.clearFactory(); 30 | + } 31 | + 32 | + @After 33 | + public void tearDown() throws Exception { 34 | + I18N.HELPER.clearFactory(); 35 | + } 36 | + 37 | + @Test 38 | + public void testGetBundleWithoutConfiguration() throws Exception { 39 | + TestBundle testBundle = I18N.HELPER.get(TestBundle.class); 40 | + 41 | + assertEquals("Test String", testBundle.testString()); 42 | + } 43 | + 44 | + @Test 45 | + public void testGetBundleWithoutConfigurationFrench() throws Exception { 46 | + TestBundle testBundle = I18N.HELPER.get(TestBundle.class, Locale.FRENCH); 47 | + 48 | + assertEquals("test de cordes", testBundle.testString()); 49 | + } 50 | + 51 | + @Test 52 | + public void testGetBundleUsingPropertiesSpanish() throws Exception { 53 | + C10NMsgFactory factory = C10N.createMsgFactory(new C10NConfigBase() { 54 | + @Override 55 | + protected void configure() { 56 | + bindBundle("au.com.finsyn.i18n.TestBundle"); 57 | + } 58 | + }); 59 | + 60 | + I18N.HELPER.useFactory(factory); 61 | + 62 | + TestBundle testBundle = I18N.HELPER.get(TestBundle.class, new Locale("ES")); 63 | + 64 | + assertEquals("Prueba de cuerda", testBundle.testString()); 65 | + } 66 | + 67 | + @Test 68 | + public void testGetBundleWithEmptyConfiguration() throws Exception { 69 | + C10NMsgFactory factory = C10N.createMsgFactory(new C10NConfigBase() { 70 | + @Override 71 | + protected void configure() { 72 | + } 73 | + }); 74 | + 75 | + I18N.HELPER.useFactory(factory); 76 | + 77 | + TestBundle testBundle = I18N.HELPER.get(TestBundle.class); 78 | + 79 | + assertEquals("TestBundle.testString", testBundle.testString()); 80 | + } 81 | + 82 | + @C10NMessages 83 | + public interface TestBundle { 84 | + @En("test string") 85 | + @Fr("test de cordes") 86 | + String testString(); 87 | + } 88 | +} 89 | \ No newline at end of file 90 | Index: src/test/resources/au/com/finsyn/i18n/TestBundle_de.properties 91 | IDEA additional info: 92 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 93 | <+>windows-1252 94 | =================================================================== 95 | --- src/test/resources/au/com/finsyn/i18n/TestBundle_de.properties (revision 30357+:74eeb64d8cfc+) 96 | +++ src/test/resources/au/com/finsyn/i18n/TestBundle_de.properties (revision 30357+:74eeb64d8cfc+) 97 | @@ -0,0 +1,1 @@ 98 | +au.com.finsyn.i18n.I18NTest.TestBundle.testString = Prueba de cuerda 99 | \ No newline at end of file 100 | Index: build.gradle 101 | IDEA additional info: 102 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 103 | <+>windows-1252 104 | =================================================================== 105 | --- build.gradle (revision 30357:74eeb64d8cfc782747a56bda35755db2f89483cc) 106 | +++ build.gradle (revision 30357+:74eeb64d8cfc+) 107 | @@ -37,6 +37,8 @@ 108 | 109 | compile 'org.slf4j:slf4j-api:1.7.12' 110 | 111 | + compile 'com.github.rodionmoiseev.c10n:c10n-core:1.2' 112 | + 113 | compile group: 'junit', name: 'junit', version: '4.11' 114 | } 115 | 116 | \ No newline at end of file 117 | Index: src/main/java/au/com/finsyn/hibernate/tools/SortOrder.java 118 | IDEA additional info: 119 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 120 | <+>windows-1252 121 | =================================================================== 122 | --- src/main/java/au/com/finsyn/hibernate/tools/SortOrder.java (revision 30357:74eeb64d8cfc782747a56bda35755db2f89483cc) 123 | +++ src/main/java/au/com/finsyn/hibernate/tools/SortOrder.java (revision 30357+:74eeb64d8cfc+) 124 | @@ -1,20 +1,23 @@ 125 | package au.com.finsyn.hibernate.tools; 126 | 127 | -import javax.annotation.ParametersAreNonnullByDefault; 128 | +import au.com.finsyn.i18n.FinsynCommonsBundle; 129 | +import au.com.finsyn.i18n.I18N; 130 | +import com.github.rodionmoiseev.c10n.C10N; 131 | + 132 | +import java.util.Locale; 133 | import java.util.Objects; 134 | 135 | public enum SortOrder { 136 | ASCENDING("ASC"), DESCENDING("DESC"); 137 | 138 | + private static final FinsynCommonsBundle BUNDLE = I18N.HELPER.get(FinsynCommonsBundle.class); 139 | + 140 | private String sqlCode; 141 | 142 | private SortOrder(String sqlCode) { 143 | this.sqlCode = Objects.requireNonNull(sqlCode); 144 | } 145 | 146 | - /** 147 | - * Returns "{@code ASC}" for {@link #ASCENDING} and "{@code DESC}" for {@link #DESCENDING}. 148 | - */ 149 | public String getSqlCode() { 150 | return sqlCode; 151 | } 152 | @@ -22,11 +25,11 @@ 153 | public String render() { 154 | switch (this) { 155 | case ASCENDING: 156 | - return "Ascending"; 157 | + return BUNDLE.sortOrder().ascending(); 158 | case DESCENDING: 159 | - return "Descending"; 160 | + return BUNDLE.sortOrder().descending(); 161 | default: 162 | - return this.toString(); 163 | + throw new UnexpectedSortOrderException(this); 164 | } 165 | } 166 | 167 | @@ -36,9 +39,9 @@ 168 | return DESCENDING; 169 | case DESCENDING: 170 | return ASCENDING; 171 | + default: 172 | + throw new UnexpectedSortOrderException(this); 173 | } 174 | - throw new AssertionError("Encountered " + SortOrder.class.getName() + " that was neither " + ASCENDING 175 | - + " nor " + DESCENDING); 176 | } 177 | 178 | public static SortOrder fromAscending(boolean isAscending) { 179 | @@ -54,5 +57,12 @@ 180 | */ 181 | public static SortOrder theDefault() { 182 | return ASCENDING; 183 | + } 184 | + 185 | + public class UnexpectedSortOrderException extends RuntimeException { 186 | + protected UnexpectedSortOrderException(SortOrder unexpected) { 187 | + super("Encountered " + SortOrder.class.getName() + " instance of type " + unexpected + " that was neither " 188 | + + ASCENDING + " nor " + DESCENDING); 189 | + } 190 | } 191 | } 192 | Index: src/test/java/au/com/finsyn/hibernate/tools/SortOrderTest.java 193 | IDEA additional info: 194 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 195 | <+>windows-1252 196 | =================================================================== 197 | --- src/test/java/au/com/finsyn/hibernate/tools/SortOrderTest.java (revision 30357+:74eeb64d8cfc+) 198 | +++ src/test/java/au/com/finsyn/hibernate/tools/SortOrderTest.java (revision 30357+:74eeb64d8cfc+) 199 | @@ -0,0 +1,48 @@ 200 | +package au.com.finsyn.hibernate.tools; 201 | + 202 | +import org.junit.Test; 203 | + 204 | +import static au.com.finsyn.hibernate.tools.SortOrder.ASCENDING; 205 | +import static au.com.finsyn.hibernate.tools.SortOrder.DESCENDING; 206 | +import static au.com.finsyn.hibernate.tools.SortOrder.fromAscending; 207 | +import static au.com.finsyn.hibernate.tools.SortOrder.fromDescending; 208 | +import static au.com.finsyn.hibernate.tools.SortOrder.theDefault; 209 | +import static org.junit.Assert.assertEquals; 210 | + 211 | +public class SortOrderTest { 212 | + 213 | + @Test 214 | + public void testGetSqlCode() throws Exception { 215 | + assertEquals("ASC", ASCENDING.getSqlCode()); 216 | + assertEquals("DESC", DESCENDING.getSqlCode()); 217 | + } 218 | + 219 | + @Test 220 | + public void testRender() throws Exception { 221 | + assertEquals("Ascending", ASCENDING.render()); 222 | + assertEquals("Descending", DESCENDING.render()); 223 | + } 224 | + 225 | + @Test 226 | + public void testInvert() throws Exception { 227 | + assertEquals(DESCENDING, ASCENDING.invert()); 228 | + assertEquals(ASCENDING, DESCENDING.invert()); 229 | + } 230 | + 231 | + @Test 232 | + public void testFromAscending() throws Exception { 233 | + assertEquals(ASCENDING, fromAscending(true)); 234 | + assertEquals(DESCENDING, fromAscending(false)); 235 | + } 236 | + 237 | + @Test 238 | + public void testFromDescending() throws Exception { 239 | + assertEquals(ASCENDING, fromDescending(false)); 240 | + assertEquals(DESCENDING, fromDescending(true)); 241 | + } 242 | + 243 | + @Test 244 | + public void testTheDefault() throws Exception { 245 | + assertEquals(ASCENDING, theDefault()); 246 | + } 247 | +} 248 | \ No newline at end of file 249 | Index: src/test/java/au/com/finsyn/i18n/C10NTest.java 250 | IDEA additional info: 251 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 252 | <+>windows-1252 253 | =================================================================== 254 | --- src/test/java/au/com/finsyn/i18n/C10NTest.java (revision 30357+:74eeb64d8cfc+) 255 | +++ src/test/java/au/com/finsyn/i18n/C10NTest.java (revision 30357+:74eeb64d8cfc+) 256 | @@ -0,0 +1,21 @@ 257 | +package au.com.finsyn.i18n; 258 | + 259 | +import com.github.rodionmoiseev.c10n.C10N; 260 | +import com.github.rodionmoiseev.c10n.C10NConfigBase; 261 | +import org.junit.Before; 262 | +import org.junit.Test; 263 | + 264 | +import static org.junit.Assert.assertEquals; 265 | +import static org.junit.Assert.assertNotSame; 266 | + 267 | +// TODO fix up this test 268 | +public class C10NTest { 269 | + 270 | + @Test 271 | + public void testC10NNoCache() throws Exception { 272 | + FinsynCommonsBundle firstMessagesInstance = C10N.get(FinsynCommonsBundle.class); 273 | + FinsynCommonsBundle secondMessagesInstance = C10N.get(FinsynCommonsBundle.class); 274 | + 275 | + assertNotSame(firstMessagesInstance, secondMessagesInstance); 276 | + } 277 | +} 278 | \ No newline at end of file 279 | Index: src/main/java/au/com/finsyn/i18n/FinsynCommonsBundle.java 280 | IDEA additional info: 281 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 282 | <+>windows-1252 283 | =================================================================== 284 | --- src/main/java/au/com/finsyn/i18n/FinsynCommonsBundle.java (revision 30357+:74eeb64d8cfc+) 285 | +++ src/main/java/au/com/finsyn/i18n/FinsynCommonsBundle.java (revision 30357+:74eeb64d8cfc+) 286 | @@ -0,0 +1,25 @@ 287 | +package au.com.finsyn.i18n; 288 | + 289 | +import com.github.rodionmoiseev.c10n.C10N; 290 | +import com.github.rodionmoiseev.c10n.C10NConfigBase; 291 | +import com.github.rodionmoiseev.c10n.C10NMessages; 292 | +import com.github.rodionmoiseev.c10n.annotations.En; 293 | +import com.github.rodionmoiseev.c10n.annotations.Ru; 294 | + 295 | +import java.util.Locale; 296 | + 297 | +@C10NMessages 298 | +public interface FinsynCommonsBundle { 299 | + 300 | + SortOrder sortOrder(); 301 | + 302 | + @C10NMessages 303 | + public interface SortOrder { 304 | + @En("Ascending") 305 | + @Ru("BLAH") 306 | + String ascending(); 307 | + 308 | + @En("Descending") 309 | + String descending(); 310 | + } 311 | +} 312 | Index: src/main/java/au/com/finsyn/i18n/I18N.java 313 | IDEA additional info: 314 | Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP 315 | <+>windows-1252 316 | =================================================================== 317 | --- src/main/java/au/com/finsyn/i18n/I18N.java (revision 30357+:74eeb64d8cfc+) 318 | +++ src/main/java/au/com/finsyn/i18n/I18N.java (revision 30357+:74eeb64d8cfc+) 319 | @@ -0,0 +1,34 @@ 320 | +package au.com.finsyn.i18n; 321 | + 322 | +import com.github.rodionmoiseev.c10n.C10NMsgFactory; 323 | + 324 | +import javax.annotation.ParametersAreNonnullByDefault; 325 | +import java.util.Locale; 326 | + 327 | +@ParametersAreNonnullByDefault 328 | +public enum I18N implements C10NMsgFactory { 329 | + 330 | + HELPER; 331 | + 332 | + public void clearFactory() { 333 | + // TODO unimplemented 334 | + throw new UnsupportedOperationException("Unimplemented"); 335 | + } 336 | + 337 | + public void useFactory(C10NMsgFactory factory) { 338 | + // TODO unimplemented 339 | + throw new UnsupportedOperationException("Unimplemented"); 340 | + } 341 | + 342 | + @Override 343 | + public T get(Class c10nInterface) { 344 | + // TODO automatically generated method stub 345 | + throw new UnsupportedOperationException(); 346 | + } 347 | + 348 | + @Override 349 | + public T get(Class c10nInterface, Locale locale) { 350 | + // TODO automatically generated method stub 351 | + throw new UnsupportedOperationException(); 352 | + } 353 | +} 354 | -------------------------------------------------------------------------------- /$APP_CONFIG$/templates.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 327 | 328 | -------------------------------------------------------------------------------- /$APP_CONFIG$/other.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | Class metricsJava 11 | 12 | 13 | Control flow issuesJava 14 | 15 | 16 | Groovy 17 | 18 | 19 | Java 20 | 21 | 22 | JavaScript 23 | 24 | 25 | JavaScript function metricsJavaScript 26 | 27 | 28 | Method MetricsGroovy 29 | 30 | 31 | Method metricsJava 32 | 33 | 34 | Numeric issuesJava 35 | 36 | 37 | Potentially confusing code constructsGroovy 38 | 39 | 40 | Potentially confusing code constructsJavaScript 41 | 42 | 43 | Probable bugsJava 44 | 45 | 46 | 47 | 48 | ParametersPerMethod 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | 60 | Java 61 | 62 | 63 | 64 | 65 | Java 66 | 67 | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | GeneralJava 78 | 79 | 80 | Internationalization issues 81 | 82 | 83 | JUnit issues 84 | 85 | 86 | JUnit issuesJava 87 | 88 | 89 | Java 90 | 91 | 92 | TestNG 93 | 94 | 95 | 96 | 97 | BeforeClassOrAfterClassIsPublicStaticVoidNoArg 98 | 99 | 100 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | Code style issuesJava 110 | 111 | 112 | Java 113 | 114 | 115 | 116 | 117 | UnnecessaryInterfaceModifier 118 | 119 | 120 | 121 | 122 | 123 | 124 | 125 | 126 | 127 | 128 | 129 | Assignment issuesJava 130 | 131 | 132 | Class metricsJava 133 | 134 | 135 | Class structureJava 136 | 137 | 138 | Cloning issuesJava 139 | 140 | 141 | Code maturity issuesJava 142 | 143 | 144 | Code style issuesJava 145 | 146 | 147 | Concurrency annotation issuesJava 148 | 149 | 150 | Finalization issuesJava 151 | 152 | 153 | FreeMarker inspections 154 | 155 | 156 | JUnit issues 157 | 158 | 159 | Java 160 | 161 | 162 | Java EE issues 163 | 164 | 165 | JavaFX 166 | 167 | 168 | Method metricsJava 169 | 170 | 171 | Performance issuesJava 172 | 173 | 174 | Probable bugsJava 175 | 176 | 177 | Properties Files 178 | 179 | 180 | Security issuesJava 181 | 182 | 183 | Serialization issuesJava 184 | 185 | 186 | Threading issuesJava 187 | 188 | 189 | Verbose or redundant code constructsJava 190 | 191 | 192 | Visibility issuesJava 193 | 194 | 195 | toString() issuesJava 196 | 197 | 198 | 199 | 200 | NonFinalFieldInImmutable 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 209 | 210 | 211 | 212 | Code style issuesJava 213 | 214 | 215 | Java 216 | 217 | 218 | Java EE issues 219 | 220 | 221 | Plugin DevKit 222 | 223 | 224 | 225 | 226 | 227 | 228 | 229 | 230 | 231 | 232 | 233 | 234 | 235 | Ant inspections 236 | 237 | 238 | 239 | 240 | 241 | 242 | 243 | 251 | 257 | 262 | 272 | 278 | 290 | 291 | 339 | 340 | 341 | 342 | 343 | 344 | 345 | 347 | 348 | 349 | false 350 | false 351 | false 352 | false 353 | true 354 | false 355 | false 356 | false 357 | 358 | 359 | false 360 | Always 361 | false 362 | false 363 | 364 | false 365 | false 366 | false 367 | false 368 | 4 369 | 370 | false 371 | 64 372 | false 373 | 10 374 | false 375 | false 376 | false 377 | false 378 | false 379 | false 380 | false 381 | false 382 | false 383 | false 384 | false 385 | false 386 | 387 | _cls 388 | _ex 389 | _fld 390 | _lcl 391 | _mth 392 | _prm 393 | 3 394 | false 395 | 10 396 | false 397 | Preferred-Style 398 | ~~java~~ 399 | false 400 | false 401 | false 402 | false 403 | false 404 | false 405 | false 406 | false 407 | 408 | 409 | 410 | 413 | 414 | 430 | 431 | 433 | 434 | 436 | 437 | 442 | 447 | 448 | 449 | 450 | 455 | 456 | 457 | 458 | 459 | 460 | 461 | 462 | 463 | 464 | 465 | 466 | 467 | 468 | 469 | 470 | 471 | -------------------------------------------------------------------------------- /$ROOT_CONFIG$/colors/Wombat.icls: -------------------------------------------------------------------------------- 1 | 2 | --------------------------------------------------------------------------------