Skip to content

Commit 01a524d

Browse files
AXONE-IOAXONE-IO
authored
Merge pull request #1 from paul-griffith/cleanups
Misc cleanups
2 parents e5597a6 + ce922d7 commit 01a524d

File tree

14 files changed

+315
-355
lines changed

14 files changed

+315
-355
lines changed

‎git-client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<artifactId>maven-compiler-plugin</artifactId>
6262
<version>3.2</version>
6363
<configuration>
64-
<source>9</source>
65-
<target>9</target>
64+
<source>${ignition-java-version}</source>
65+
<target>${ignition-java-version}</target>
6666
</configuration>
6767
</plugin>
6868
</plugins>

‎git-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<artifactId>maven-compiler-plugin</artifactId>
2929
<version>3.2</version>
3030
<configuration>
31-
<source>9</source>
32-
<target>9</target>
31+
<source>${ignition-java-version}</source>
32+
<target>${ignition-java-version}</target>
3333
</configuration>
3434
</plugin>
3535
</plugins>

‎git-common/src/main/java/com/axone_io/ignition/git/AbstractScriptModule.java‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,52 @@ public abstract class AbstractScriptModule implements GitScriptInterface {
1818
}
1919
@Override
2020
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
21-
public boolean pull(@ScriptArg("projectName") String projectName, @ScriptArg("userName") String userName) throws Exception {
21+
public boolean pull(@ScriptArg("projectName") String projectName,
22+
@ScriptArg("userName") String userName) throws Exception {
2223
return pullImpl(projectName, userName);
2324
}
2425

2526

2627
@Override
2728
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
28-
public boolean push(@ScriptArg("projectName") String projectName, @ScriptArg("userName")String userName) throws Exception {
29+
public boolean push(@ScriptArg("projectName") String projectName,
30+
@ScriptArg("userName")String userName) throws Exception {
2931
return pushImpl(projectName,userName);
3032
}
3133

3234
@Override
3335
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
34-
public boolean commit(@ScriptArg("projectName") String projectName, @ScriptArg("userName") String userName, @ScriptArg("changes") List<String> changes, @ScriptArg("message") String message) {
36+
public boolean commit(@ScriptArg("projectName") String projectName,
37+
@ScriptArg("userName") String userName,
38+
@ScriptArg("changes") List<String> changes,
39+
@ScriptArg("message") String message) {
3540
return commitImpl(projectName, userName, changes, message);
3641
}
3742

3843
@Override
3944
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
40-
public Dataset getUncommitedChanges(@ScriptArg("projectName") String projectName, @ScriptArg("userName") String userName) {
45+
public Dataset getUncommitedChanges(@ScriptArg("projectName") String projectName,
46+
@ScriptArg("userName") String userName) {
4147
return getUncommitedChangesImpl(projectName, userName);
4248
}
4349

4450
@Override
4551
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
46-
public boolean isRegisteredUser( @ScriptArg("projectName") String projectName, @ScriptArg("userName") String userName) {
52+
public boolean isRegisteredUser(@ScriptArg("projectName") String projectName,
53+
@ScriptArg("userName") String userName) {
4754
return isRegisteredUserImpl(projectName, userName);
4855
}
4956

5057
@Override
5158
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
52-
public boolean exportConfig( @ScriptArg("projectName") String projectName) {
59+
public boolean exportConfig(@ScriptArg("projectName") String projectName) {
5360
return exportConfigImpl(projectName);
5461
}
5562

5663
@Override
5764
@ScriptFunction(docBundlePrefix = "AbstractScriptModule")
58-
public void setupLocalRepo( @ScriptArg("projectName") String projectName, @ScriptArg("userName") String userName) throws Exception {
65+
public void setupLocalRepo(@ScriptArg("projectName") String projectName,
66+
@ScriptArg("userName") String userName) throws Exception {
5967
setupLocalRepoImpl(projectName, userName);
6068
}
6169

‎git-designer/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<artifactId>maven-compiler-plugin</artifactId>
6565
<version>3.2</version>
6666
<configuration>
67-
<source>9</source>
68-
<target>9</target>
67+
<source>${ignition-java-version}</source>
68+
<target>${ignition-java-version}</target>
6969
</configuration>
7070
</plugin>
7171
</plugins>

‎git-designer/src/main/java/com/axone_io/ignition/git/CommitPopup.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public CommitPopup(Object[][] data, Component parent) {
4848

4949
String[] columnNames = {"", "Resource Name", "Type", "Author"};
5050

51-
5251
DefaultTableModel model = new DefaultTableModel(data, columnNames) {
5352
public Class<?> getColumnClass(int column) {
5453
switch (column) {
@@ -75,7 +74,7 @@ public Class<?> getColumnClass(int column) {
7574

7675
commitBtn.addActionListener(e -> {
7776
List<String> changes = new ArrayList<>();
78-
for (Integer i = 0; i < changesTable.getModel().getRowCount(); i++) {
77+
for (int i = 0; i < changesTable.getModel().getRowCount(); i++) {
7978
if ((Boolean) changesTable.getValueAt(i, 0)) {
8079
changes.add((String) changesTable.getValueAt(i, 1));
8180
}
@@ -87,7 +86,6 @@ public Class<?> getColumnClass(int column) {
8786

8887
cancelBtn.addActionListener(e -> this.dispose());
8988

90-
9189
pack();
9290
CommonUI.centerComponent(this, parent);
9391
toFront();

‎git-designer/src/main/java/com/axone_io/ignition/git/DesignerHook.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,19 @@
1111
import com.inductiveautomation.ignition.designer.gui.StatusBar;
1212
import com.inductiveautomation.ignition.designer.model.DesignerContext;
1313
import com.inductiveautomation.ignition.common.script.ScriptManager;
14-
import com.inductiveautomation.ignition.common.script.hints.PropertiesFileDocProvider;
1514
import com.inductiveautomation.ignition.designer.model.AbstractDesignerModuleHook;
1615
import com.inductiveautomation.ignition.designer.model.SaveContext;
1716
import com.jidesoft.action.DockableBarManager;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2017

2118
import javax.swing.*;
2219
import javax.swing.Timer;
23-
import java.io.IOException;
2420
import java.util.*;
2521
import java.util.List;
2622

27-
import static com.axone_io.ignition.git.managers.GitActionManager.handleCommitPopup;
23+
import static com.axone_io.ignition.git.managers.GitActionManager.showCommitPopup;
2824

2925
public class DesignerHook extends AbstractDesignerModuleHook {
3026

31-
private final Logger logger = LoggerFactory.getLogger(getClass());
3227
public static GitScriptInterface rpc = ModuleRPCFactory.create(
3328
"com.axone_io.ignition.git",
3429
GitScriptInterface.class
@@ -116,7 +111,7 @@ public void notifyProjectSaveStart(SaveContext save) {
116111
public void notifyProjectSaveDone(){
117112
super.notifyProjectSaveDone();
118113

119-
handleCommitPopup(projectName, userName);
114+
showCommitPopup(projectName, userName);
120115
}
121116

122117
@Override

‎git-designer/src/main/java/com/axone_io/ignition/git/actions/GitBaseAction.java‎

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.axone_io.ignition.git.actions;
22

3-
import com.axone_io.ignition.git.managers.GitActionManager;
3+
import com.axone_io.ignition.git.utils.IconUtils;
44
import com.inductiveautomation.ignition.client.util.action.BaseAction;
5+
import com.inductiveautomation.ignition.client.util.gui.ErrorUtil;
56
import com.inductiveautomation.ignition.common.BundleUtil;
67
import org.slf4j.Logger;
78
import org.slf4j.LoggerFactory;
@@ -11,55 +12,75 @@
1112
import java.util.List;
1213

1314
import static com.axone_io.ignition.git.DesignerHook.*;
14-
import static com.axone_io.ignition.git.managers.GitActionManager.*;
15-
import static com.axone_io.ignition.git.managers.GitActionManager.handleConfirmPopup;
15+
import static com.axone_io.ignition.git.managers.GitActionManager.showCommitPopup;
16+
import static com.axone_io.ignition.git.managers.GitActionManager.showConfirmPopup;
1617

1718
public class GitBaseAction extends BaseAction {
1819
private static final Logger logger = LoggerFactory.getLogger(GitBaseAction.class);
1920

2021
public enum GitActionType {
21-
PULL,
22-
PUSH,
23-
COMMIT,
24-
EXPORT
22+
PULL(
23+
"DesignerHook.Actions.Pull",
24+
"/com/axone_io/ignition/git/icons/ic_pull.svg"
25+
),
26+
PUSH(
27+
"DesignerHook.Actions.Push",
28+
"/com/axone_io/ignition/git/icons/ic_push.svg"
29+
),
30+
COMMIT(
31+
"DesignerHook.Actions.Commit",
32+
"/com/axone_io/ignition/git/icons/ic_commit.svg"
33+
),
34+
EXPORT(
35+
"DesignerHook.Actions.ExportGatewayConfig",
36+
"/com/axone_io/ignition/git/icons/ic_folder.svg"
37+
);
38+
39+
private final String baseBundleKey;
40+
private final String resourcePath;
41+
42+
GitActionType(String baseBundleKey, String resourcePath) {
43+
this.baseBundleKey = baseBundleKey;
44+
this.resourcePath = resourcePath;
45+
}
46+
47+
public Icon getIcon() {
48+
return IconUtils.getIcon(resourcePath);
49+
}
2550
}
2651

2752
GitActionType type;
53+
2854
public GitBaseAction(GitActionType type) {
29-
super(getBundleKey(type), getIcon(type));
55+
super(type.baseBundleKey, type.getIcon());
3056
this.type = type;
3157
}
3258

33-
3459
@Override
3560
public void actionPerformed(ActionEvent e) {
3661
handleAction(type);
3762
}
3863

39-
// Todo : Find a way to refacto with handleAction
40-
public static void handleCommitAction(List<String> changes, String commitMessage){
41-
String message = BundleUtil.get().getStringLenient(getBundleKey(GitActionType.COMMIT) + ".ConfirmMessage");
64+
// Todo : Find a way to refactor with handleAction
65+
public static void handleCommitAction(List<String> changes, String commitMessage) {
66+
String message = BundleUtil.get().getStringLenient(GitActionType.COMMIT.baseBundleKey + ".ConfirmMessage");
4267
int messageType = JOptionPane.INFORMATION_MESSAGE;
4368

4469
try {
4570
rpc.commit(projectName, userName, changes, commitMessage);
71+
SwingUtilities.invokeLater(new Thread(() -> showConfirmPopup(message, messageType)));
4672
} catch (Exception ex) {
47-
message = ex.getMessage();
48-
messageType = JOptionPane.ERROR_MESSAGE;
73+
ErrorUtil.showError(ex);
4974
}
50-
51-
String finalMessage = message;
52-
int finalMessageType = messageType;
53-
SwingUtilities.invokeLater(new Thread(() -> handleConfirmPopup(finalMessage, finalMessageType)));
5475
}
5576

56-
public static void handleAction(GitActionType type){
57-
String message = BundleUtil.get().getStringLenient(getBundleKey(type) + ".ConfirmMessage");
77+
public static void handleAction(GitActionType type) {
78+
String message = BundleUtil.get().getStringLenient(type.baseBundleKey + ".ConfirmMessage");
5879
int messageType = JOptionPane.INFORMATION_MESSAGE;
5980
boolean confirmPopup = Boolean.TRUE;
6081

6182
try {
62-
switch (type){
83+
switch (type) {
6384
case PULL:
6485
rpc.pull(projectName, userName);
6586
break;
@@ -68,20 +89,16 @@ public static void handleAction(GitActionType type){
6889
break;
6990
case COMMIT:
7091
confirmPopup = Boolean.FALSE;
71-
handleCommitPopup(projectName, userName);
92+
showCommitPopup(projectName, userName);
7293
break;
7394
case EXPORT:
7495
rpc.exportConfig(projectName);
7596
break;
7697
}
98+
if(confirmPopup) SwingUtilities.invokeLater(new Thread(() -> showConfirmPopup(message, messageType)));
99+
77100
} catch (Exception ex) {
78-
logger.info(ex.getMessage());
79-
message = ex.getMessage();
80-
messageType = JOptionPane.ERROR_MESSAGE;
101+
ErrorUtil.showError(ex);
81102
}
82-
83-
String finalMessage = message;
84-
int finalMessageType = messageType;
85-
if(confirmPopup) SwingUtilities.invokeLater(new Thread(() -> handleConfirmPopup(finalMessage, finalMessageType)));
86103
}
87104
}

‎git-designer/src/main/java/com/axone_io/ignition/git/managers/GitActionManager.java‎

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22

33
import com.axone_io.ignition.git.CommitPopup;
44
import com.axone_io.ignition.git.DesignerHook;
5-
import com.axone_io.ignition.git.actions.GitBaseAction;
6-
import com.axone_io.ignition.git.utils.IconUtils;
75
import com.inductiveautomation.ignition.common.Dataset;
86
import com.inductiveautomation.ignition.common.project.ChangeOperation;
97
import com.inductiveautomation.ignition.common.project.resource.ProjectResourceId;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
128

139
import javax.swing.*;
1410
import java.util.ArrayList;
1511
import java.util.List;
1612

17-
import static com.axone_io.ignition.git.DesignerHook.*;
13+
import static com.axone_io.ignition.git.DesignerHook.context;
14+
import static com.axone_io.ignition.git.DesignerHook.rpc;
1815
import static com.axone_io.ignition.git.actions.GitBaseAction.handleCommitAction;
1916

2017
public class GitActionManager {
21-
private static final Logger logger = LoggerFactory.getLogger(GitActionManager.class);
22-
public static Object[][] getCommitPopupData(String projectName, String userName){
18+
public static Object[][] getCommitPopupData(String projectName, String userName) {
2319
List<ChangeOperation> changes = DesignerHook.changes;
2420

2521
Dataset ds = rpc.getUncommitedChanges(projectName, userName);
@@ -42,7 +38,7 @@ public static Object[][] getCommitPopupData(String projectName, String userName)
4238
return data;
4339
}
4440

45-
public static void handleCommitPopup(String projectName, String userName){
41+
public static void showCommitPopup(String projectName, String userName) {
4642
new CommitPopup(GitActionManager.getCommitPopupData(projectName, userName), context.getFrame()) {
4743
@Override
4844
public void onActionPerformed(List<String> changes, String commitMessage) {
@@ -51,47 +47,7 @@ public void onActionPerformed(List<String> changes, String commitMessage) {
5147
};
5248
}
5349

54-
55-
public static String getBundleKey(GitBaseAction.GitActionType type){
56-
String bundleKey = "";
57-
switch (type){
58-
case PULL:
59-
bundleKey = "DesignerHook.Actions.Pull";
60-
break;
61-
case PUSH:
62-
bundleKey = "DesignerHook.Actions.Push";
63-
break;
64-
case COMMIT:
65-
bundleKey = "DesignerHook.Actions.Commit";
66-
break;
67-
case EXPORT:
68-
bundleKey = "DesignerHook.Actions.ExportGatewayConfig";
69-
break;
70-
}
71-
return bundleKey;
72-
}
73-
74-
public static Icon getIcon(GitBaseAction.GitActionType type) {
75-
String resourcePath = "";
76-
switch (type){
77-
case PULL:
78-
resourcePath = "/com/axone_io/ignition/git/icons/ic_pull.svg";
79-
break;
80-
case PUSH:
81-
resourcePath = "/com/axone_io/ignition/git/icons/ic_push.svg";
82-
break;
83-
case COMMIT:
84-
resourcePath = "/com/axone_io/ignition/git/icons/ic_commit.svg";
85-
break;
86-
case EXPORT:
87-
resourcePath = "/com/axone_io/ignition/git/icons/ic_folder.svg";
88-
break;
89-
}
90-
91-
return IconUtils.getIcon(resourcePath);
92-
}
93-
94-
public static void handleConfirmPopup(String message, int messageType){
50+
public static void showConfirmPopup(String message, int messageType){
9551
JOptionPane.showConfirmDialog(context.getFrame(),
9652
message, "Info", JOptionPane.DEFAULT_OPTION, messageType);
9753
}

‎git-gateway/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<artifactId>maven-compiler-plugin</artifactId>
4747
<version>3.2</version>
4848
<configuration>
49-
<source>9</source>
50-
<target>9</target>
49+
<source>11</source>
50+
<target>11</target>
5151
</configuration>
5252
</plugin>
5353
</plugins>

0 commit comments

Comments
 (0)