Skip to content

Commit 9428cf9

Browse files
lilstiffylilstiffy
committed
Some minor tweaks to current add new directory flow, cleanup and improvements
1 parent 1638eaa commit 9428cf9

6 files changed

Lines changed: 56 additions & 42 deletions

File tree

‎src/main/java/org/pwss/controller/NewDirectoryController.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.pwss.model.service.MonitoredDirectoryService;
44
import org.pwss.navigation.NavigationEvents;
55
import org.pwss.navigation.Screen;
6+
import org.pwss.utils.StringConstants;
67
import org.pwss.view.screen.NewDirectoryScreen;
78

89
import javax.swing.*;
@@ -30,7 +31,7 @@ void initListeners() {
3031

3132
@Override
3233
void refreshView() {
33-
getScreen().getPathLabel().setText(selectedPath != null ? selectedPath : "No folder selected");
34+
getScreen().getPathLabel().setText(selectedPath != null ? selectedPath : StringConstants.NEW_DIR_NO_PATH_SELECTED);
3435
getScreen().getCreateButton().setEnabled(selectedPath != null && !selectedPath.isEmpty());
3536
}
3637

@@ -59,10 +60,10 @@ private void createNewDirectory() {
5960
if (selectedPath != null && !selectedPath.isEmpty()) {
6061
try {
6162
monitoredDirectoryService.createNewMonitoredDirectory(selectedPath, includeSubdirectories, makeActive);
62-
JOptionPane.showMessageDialog(getScreen().getRootPanel(), "Directory added successfully!", "Success", JOptionPane.INFORMATION_MESSAGE);
63+
JOptionPane.showMessageDialog(getScreen().getRootPanel(), StringConstants.NEW_DIR_SUCCESS_TEXT, StringConstants.GENERIC_SUCCESS, JOptionPane.INFORMATION_MESSAGE);
6364
NavigationEvents.navigateTo(Screen.HOME, null);
6465
} catch (Exception e) {
65-
JOptionPane.showMessageDialog(getScreen().getRootPanel(), "Failed to add directory: " + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
66+
JOptionPane.showMessageDialog(getScreen().getRootPanel(), StringConstants.NEW_DIR_ERROR_PREFIX + e.getMessage(), StringConstants.GENERIC_ERROR, JOptionPane.ERROR_MESSAGE);
6667
}
6768
}
6869
}

‎src/main/java/org/pwss/utils/StringConstants.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ public final class StringConstants {
77
// General purpose strings
88
public static final String GENERIC_YES = "Yes";
99
public static final String GENERIC_NO = "No";
10+
public static final String GENERIC_SUCCESS = "Success";
11+
public static final String GENERIC_ERROR = "Error";
1012

1113
// Scan related strings
1214
public static final String SCAN_FULL = "Full scan";
@@ -35,4 +37,9 @@ public final class StringConstants {
3537
public static final String MON_DIR_POPUP_RESET_BASELINE_ERROR_INVALID = "Invalid code. Baseline reset cancelled.";
3638
public static final String MON_DIR_POPUP_RESET_BASELINE_ERROR_PREFIX = "Error resetting baseline: ";
3739
public static final String MON_DIR_POPUP_EDIT_DIR = "Edit this directory";
40+
41+
// New directory screen related strings
42+
public static final String NEW_DIR_SUCCESS_TEXT = "Directory added successfully!";
43+
public static final String NEW_DIR_ERROR_PREFIX = "Failed to add directory: ";
44+
public static final String NEW_DIR_NO_PATH_SELECTED = "No directory selected.";
3845
}

‎src/main/java/org/pwss/view/screen/HomeScreen.form‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<text value="Scan logs"/>
124124
</properties>
125125
</component>
126-
<grid id="7210a" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
126+
<grid id="7210a" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
127127
<margin top="0" left="0" bottom="0" right="0"/>
128128
<constraints>
129129
<grid row="7" column="0" row-span="3" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -139,14 +139,6 @@
139139
<text value="New directory"/>
140140
</properties>
141141
</component>
142-
<component id="7539b" class="javax.swing.JButton" binding="editDirectoryButton">
143-
<constraints>
144-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
145-
</constraints>
146-
<properties>
147-
<text value="Edit directory"/>
148-
</properties>
149-
</component>
150142
</children>
151143
</grid>
152144
<component id="896d7" class="javax.swing.JLabel" binding="liveFeedDiffCount">

‎src/main/java/org/pwss/view/screen/HomeScreen.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,11 @@ public JButton getClearFeedButton() {
169169
liveFeedTitle.setText("Scan logs");
170170
scanTab.add(liveFeedTitle, new GridConstraints(0, 1, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
171171
final JPanel panel1 = new JPanel();
172-
panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1));
172+
panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
173173
scanTab.add(panel1, new GridConstraints(7, 0, 3, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
174174
newDirectoryButton = new JButton();
175175
newDirectoryButton.setText("New directory");
176176
panel1.add(newDirectoryButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
177-
editDirectoryButton = new JButton();
178-
editDirectoryButton.setText("Edit directory");
179-
panel1.add(editDirectoryButton, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
180177
liveFeedDiffCount = new JLabel();
181178
liveFeedDiffCount.setText("");
182179
scanTab.add(liveFeedDiffCount, new GridConstraints(9, 2, 1, 2, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));

‎src/main/java/org/pwss/view/screen/NewDirectoryScreen.form‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.pwss.view.screen.NewDirectoryScreen">
3-
<grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="true" hgap="-1" vgap="-1">
44
<margin top="10" left="10" bottom="10" right="10"/>
55
<constraints>
66
<xy x="20" y="20" width="500" height="400"/>
77
</constraints>
88
<properties/>
99
<border type="none"/>
1010
<children>
11-
<component id="6b71c" class="javax.swing.JButton" binding="cancelButton" default-binding="true">
12-
<constraints>
13-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
14-
</constraints>
15-
<properties>
16-
<text value="Cancel"/>
17-
</properties>
18-
</component>
19-
<component id="5b6d4" class="javax.swing.JButton" binding="createButton" default-binding="true">
20-
<constraints>
21-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
22-
</constraints>
23-
<properties>
24-
<text value="Create"/>
25-
</properties>
26-
</component>
2711
<grid id="285ad" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
2812
<margin top="0" left="0" bottom="0" right="0"/>
2913
<constraints>
30-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
14+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
3115
</constraints>
3216
<properties/>
3317
<border type="none"/>
@@ -53,6 +37,7 @@
5337
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
5438
</constraints>
5539
<properties>
40+
<selected value="true"/>
5641
<text value="Include subdirectories"/>
5742
</properties>
5843
</component>
@@ -61,11 +46,38 @@
6146
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
6247
</constraints>
6348
<properties>
49+
<selected value="true"/>
6450
<text value="Make directory active"/>
6551
</properties>
6652
</component>
6753
</children>
6854
</grid>
55+
<grid id="d2e1a" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
56+
<margin top="0" left="0" bottom="0" right="0"/>
57+
<constraints>
58+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
59+
</constraints>
60+
<properties/>
61+
<border type="none"/>
62+
<children>
63+
<component id="5b6d4" class="javax.swing.JButton" binding="createButton" default-binding="true">
64+
<constraints>
65+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
66+
</constraints>
67+
<properties>
68+
<text value="Create"/>
69+
</properties>
70+
</component>
71+
<component id="6b71c" class="javax.swing.JButton" binding="cancelButton" default-binding="true">
72+
<constraints>
73+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
74+
</constraints>
75+
<properties>
76+
<text value="Cancel"/>
77+
</properties>
78+
</component>
79+
</children>
80+
</grid>
6981
</children>
7082
</grid>
7183
</form>

‎src/main/java/org/pwss/view/screen/NewDirectoryScreen.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,28 +65,33 @@ public JPanel getRootPanel() {
6565
*/
6666
private void $$$setupUI$$$() {
6767
rootPanel = new JPanel();
68-
rootPanel.setLayout(new GridLayoutManager(3, 1, new Insets(10, 10, 10, 10), -1, -1));
69-
cancelButton = new JButton();
70-
cancelButton.setText("Cancel");
71-
rootPanel.add(cancelButton, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
72-
createButton = new JButton();
73-
createButton.setText("Create");
74-
rootPanel.add(createButton, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
68+
rootPanel.setLayout(new GridLayoutManager(2, 1, new Insets(10, 10, 10, 10), -1, -1, false, true));
7569
final JPanel panel1 = new JPanel();
7670
panel1.setLayout(new GridLayoutManager(3, 2, new Insets(0, 0, 0, 0), -1, -1));
77-
rootPanel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
71+
rootPanel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
7872
pathLabel = new JLabel();
7973
pathLabel.setText("Please pick a path");
8074
panel1.add(pathLabel, new GridConstraints(0, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
8175
selectPathButton = new JButton();
8276
selectPathButton.setText("Select path");
8377
panel1.add(selectPathButton, new GridConstraints(1, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
8478
includeSubdirectoriesCheckBox = new JCheckBox();
79+
includeSubdirectoriesCheckBox.setSelected(true);
8580
includeSubdirectoriesCheckBox.setText("Include subdirectories");
8681
panel1.add(includeSubdirectoriesCheckBox, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
8782
makeDirectoryActiveCheckBox = new JCheckBox();
83+
makeDirectoryActiveCheckBox.setSelected(true);
8884
makeDirectoryActiveCheckBox.setText("Make directory active");
8985
panel1.add(makeDirectoryActiveCheckBox, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
86+
final JPanel panel2 = new JPanel();
87+
panel2.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1));
88+
rootPanel.add(panel2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
89+
createButton = new JButton();
90+
createButton.setText("Create");
91+
panel2.add(createButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
92+
cancelButton = new JButton();
93+
cancelButton.setText("Cancel");
94+
panel2.add(cancelButton, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
9095
}
9196

9297
/**

0 commit comments

Comments
 (0)