Skip to content

Commit f628d49

Browse files
mgaffiganmgaffigan
authored
Merge branch 'main' into oieserver-launchscript
2 parents 309d060 + 6865d88 commit f628d49

File tree

40 files changed

+5419
-2618
lines changed

40 files changed

+5419
-2618
lines changed

‎client/ant-build.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<property name="plugins.dashboardstatus" value="${extensions}/dashboardstatus" />
4747
<property name="plugins.destinationsetfilter" value="${extensions}/destinationsetfilter" />
4848
<property name="plugins.dicomviewer" value="${extensions}/dicomviewer" />
49-
<property name="plugins.extensionmanager" value="${extensions}/extensionmanager" />
5049
<property name="plugins.httpauth" value="${extensions}/httpauth" />
5150
<property name="plugins.imageviewer" value="${extensions}/imageviewer" />
5251
<property name="plugins.javascriptrule" value="${extensions}/javascriptrule" />
@@ -234,11 +233,6 @@
234233
<include name="com/mirth/connect/plugins/dicomviewer/**" />
235234
</jar>
236235

237-
<mkdir dir="${plugins.extensionmanager}" />
238-
<jar destfile="${plugins.extensionmanager}/extensionmanager-client.jar" basedir="${classes}">
239-
<include name="com/mirth/connect/plugins/extensionmanager/**" />
240-
</jar>
241-
242236
<mkdir dir="${plugins.globalmapviewer}" />
243237
<jar destfile="${plugins.globalmapviewer}/globalmapviewer-client.jar" basedir="${classes}">
244238
<include name="com/mirth/connect/plugins/globalmapviewer/**" />
@@ -372,4 +366,4 @@
372366
<delete dir="${classes}" />
373367
<delete dir="${test_classes}" />
374368
</target>
375-
</project>
369+
</project>

‎client/src/com/mirth/connect/client/ui/MirthTheme.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected ColorUIResource getPrimary3() {
5858
*/
5959
public void addCustomEntriesToTable(UIDefaults table) {
6060
super.addCustomEntriesToTable(table);
61-
Object[] uiDefaults = { PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, new Integer(30), };
61+
Object[] uiDefaults = { PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, 30, };
6262
table.putDefaults(uiDefaults);
6363
}
6464
}

‎client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ public void done() {
476476
updateEventTable(events);
477477

478478
if (!events.hasNextPage()) {
479-
events.setItemCount(new Long(((retrievedPageNumber - 1) * events.getPageSize()) + events.size()));
479+
events.setItemCount(Long.valueOf(((retrievedPageNumber - 1) * events.getPageSize()) + events.size()));
480480
enableCountButton = false;
481481
}
482482
} else {
@@ -485,7 +485,7 @@ public void done() {
485485
model.refreshDataVector(new Object[0][0]);
486486
}
487487

488-
events.setItemCount(new Long((retrievedPageNumber - 1) * events.getPageSize()));
488+
events.setItemCount(Long.valueOf((retrievedPageNumber - 1) * events.getPageSize()));
489489
enableCountButton = false;
490490
pageNumberField.setText("0");
491491
}

‎client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,9 @@ public void loadChannel(MessageBrowserChannelModel channelModel) {
382382
MessageBrowserTableColumnFactory columnFactory = (MessageBrowserTableColumnFactory) messageTreeTable.getColumnFactory();
383383
for (int modelIndex = 0; modelIndex < columnList.size(); modelIndex++) {
384384
TableColumnExt column = columnFactory.createAndConfigureTableColumn(messageTreeTable.getModel(), modelIndex);
385+
if (modelIndex >= columnMap.size()) {
386+
columnFactory.configureCustomColumn(column, metaDataColumns.get(modelIndex - columnMap.size()).getType());
387+
}
385388
messageTreeTable.addColumn(column);
386389
}
387390

@@ -965,11 +968,11 @@ public void done() {
965968
}
966969

967970
if (!messages.hasNextPage()) {
968-
messages.setItemCount(new Long(((retrievedPageNumber - 1) * messages.getPageSize()) + messages.size()));
971+
messages.setItemCount(Long.valueOf(((retrievedPageNumber - 1) * messages.getPageSize()) + messages.size()));
969972
enableCountButton = false;
970973
}
971974
} else {
972-
messages.setItemCount(new Long((retrievedPageNumber - 1) * messages.getPageSize()));
975+
messages.setItemCount(Long.valueOf((retrievedPageNumber - 1) * messages.getPageSize()));
973976
enableCountButton = false;
974977
pageNumberField.setText("0");
975978
}

‎client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ public MirthBlankableSpinner(Integer minimum, Integer maximum) {
2323

2424
public Integer getIntegerValue() {
2525
Object value = getValue();
26-
return (value == null || value.equals("")) ? null : new Integer(value.toString());
26+
return (value == null || value.equals("")) ? null : Integer.valueOf(value.toString());
2727
}
2828
}

‎client/src/com/mirth/connect/client/ui/components/MirthBlankableSpinnerModel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public MirthBlankableSpinnerModel(Integer minimum, Integer maximum) {
3636

3737
@Override
3838
public Object getNextValue() {
39-
return (value.equals("")) ? startValue : min(new Integer(value.toString()) + 1, maximum);
39+
return (value.equals("")) ? startValue : min(Integer.valueOf(value.toString()) + 1, maximum);
4040
}
4141

4242
@Override
4343
public Object getPreviousValue() {
44-
return (value.equals("")) ? startValue : max(new Integer(value.toString()) - 1, minimum);
44+
return (value.equals("")) ? startValue : max(Integer.valueOf(value.toString()) - 1, minimum);
4545
}
4646

4747
@Override
@@ -55,7 +55,7 @@ public void setValue(Object object) {
5555
value = null;
5656
} else {
5757
try {
58-
value = new Integer(object.toString());
58+
value = Integer.valueOf(object.toString());
5959

6060
if (minimum != null && (Integer) value < minimum) {
6161
value = minimum;

‎client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.java‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
import com.mirth.connect.client.ui.components.rsta.actions.ExpandFoldAction;
6363
import com.mirth.connect.client.ui.components.rsta.actions.FindNextAction;
6464
import com.mirth.connect.client.ui.components.rsta.actions.FindReplaceAction;
65+
import com.mirth.connect.client.ui.components.rsta.actions.FormatCodeAction;
6566
import com.mirth.connect.client.ui.components.rsta.actions.GoToMatchingBracketAction;
6667
import com.mirth.connect.client.ui.components.rsta.actions.HorizontalPageAction;
6768
import com.mirth.connect.client.ui.components.rsta.actions.InsertBreakAction;
@@ -127,6 +128,9 @@ public class MirthRSyntaxTextArea extends RSyntaxTextArea implements MirthTextIn
127128
private CustomJCheckBoxMenuItem showWhitespaceMenuItem;
128129
private CustomJCheckBoxMenuItem showLineEndingsMenuItem;
129130
private CustomJCheckBoxMenuItem wrapLinesMenuItem;
131+
private JMenu codeMenu;
132+
private CustomMenuItem formatCodeMenuItem;
133+
private CustomMenuItem toggleCommentMenuItem;
130134
private JMenu macroMenu;
131135
private CustomMenuItem beginMacroMenuItem;
132136
private CustomMenuItem endMacroMenuItem;
@@ -228,6 +232,9 @@ public void keyPressed(KeyEvent e) {
228232
showWhitespaceMenuItem = new CustomJCheckBoxMenuItem(this, new ShowWhitespaceAction(this), ActionInfo.DISPLAY_SHOW_WHITESPACE);
229233
showLineEndingsMenuItem = new CustomJCheckBoxMenuItem(this, new ShowLineEndingsAction(this), ActionInfo.DISPLAY_SHOW_LINE_ENDINGS);
230234
wrapLinesMenuItem = new CustomJCheckBoxMenuItem(this, new WrapLinesAction(this), ActionInfo.DISPLAY_WRAP_LINES);
235+
codeMenu = new JMenu("Code");
236+
formatCodeMenuItem = new CustomMenuItem(this, new FormatCodeAction(this), ActionInfo.FORMAT_CODE);
237+
toggleCommentMenuItem = new CustomMenuItem(this, new ToggleCommentAction(this), ActionInfo.TOGGLE_COMMENT);
231238
macroMenu = new JMenu("Macro");
232239
beginMacroMenuItem = new CustomMenuItem(this, new BeginMacroAction(), ActionInfo.MACRO_BEGIN);
233240
endMacroMenuItem = new CustomMenuItem(this, new EndMacroAction(), ActionInfo.MACRO_END);
@@ -239,7 +246,8 @@ public void keyPressed(KeyEvent e) {
239246
getActionMap().put(ActionInfo.DELETE_LINE.getActionMapKey(), new DeleteLineAction());
240247
getActionMap().put(ActionInfo.JOIN_LINE.getActionMapKey(), new JoinLineAction());
241248
getActionMap().put(ActionInfo.GO_TO_MATCHING_BRACKET.getActionMapKey(), new GoToMatchingBracketAction());
242-
getActionMap().put(ActionInfo.TOGGLE_COMMENT.getActionMapKey(), new ToggleCommentAction());
249+
getActionMap().put(ActionInfo.FORMAT_CODE.getActionMapKey(), new FormatCodeAction(this));
250+
getActionMap().put(ActionInfo.TOGGLE_COMMENT.getActionMapKey(), new ToggleCommentAction(this));
243251
getActionMap().put(ActionInfo.DOCUMENT_START.getActionMapKey(), new DocumentStartAction(false));
244252
getActionMap().put(ActionInfo.DOCUMENT_SELECT_START.getActionMapKey(), new DocumentStartAction(true));
245253
getActionMap().put(ActionInfo.DOCUMENT_END.getActionMapKey(), new DocumentEndAction(false));
@@ -489,6 +497,11 @@ protected JPopupMenu createPopupMenu() {
489497
menu.add(displayMenu);
490498
menu.addSeparator();
491499

500+
codeMenu.add(formatCodeMenuItem);
501+
codeMenu.add(toggleCommentMenuItem);
502+
menu.add(codeMenu);
503+
menu.addSeparator();
504+
492505
macroMenu.add(beginMacroMenuItem);
493506
macroMenu.add(endMacroMenuItem);
494507
macroMenu.add(playbackMacroMenuItem);
@@ -514,6 +527,8 @@ protected void configurePopupMenu(JPopupMenu popupMenu) {
514527
findNextMenuItem.setEnabled(findNextMenuItem.getAction().isEnabled() && CollectionUtils.isNotEmpty(rstaPreferences.getFindReplaceProperties().getFindHistory()));
515528
clearMarkedOccurrencesMenuItem.setEnabled(clearMarkedOccurrencesMenuItem.getAction().isEnabled() && canType && ((RSyntaxTextAreaHighlighter) getHighlighter()).getMarkAllHighlightCount() > 0);
516529
foldingMenu.setEnabled(getFoldManager().isCodeFoldingSupportedAndEnabled());
530+
formatCodeMenuItem.setEnabled(formatCodeMenuItem.getAction().isEnabled());
531+
toggleCommentMenuItem.setEnabled(toggleCommentMenuItem.getAction().isEnabled());
517532
beginMacroMenuItem.setEnabled(!isRecordingMacro());
518533
endMacroMenuItem.setEnabled(isRecordingMacro());
519534
playbackMacroMenuItem.setEnabled(!isRecordingMacro() && getCurrentMacro() != null);
@@ -533,6 +548,8 @@ protected void configurePopupMenu(JPopupMenu popupMenu) {
533548
collapseAllFoldsMenuItem.updateAccelerator();
534549
collapseAllCommentFoldsMenuItem.updateAccelerator();
535550
expandAllFoldsMenuItem.updateAccelerator();
551+
formatCodeMenuItem.updateAccelerator();
552+
toggleCommentMenuItem.updateAccelerator();
536553
beginMacroMenuItem.updateAccelerator();
537554
endMacroMenuItem.updateAccelerator();
538555
playbackMacroMenuItem.updateAccelerator();
@@ -550,4 +567,4 @@ public void setSyntaxEditingStyle(String styleKey) {
550567
public Action[] getActions() {
551568
return actions != null ? actions : getUI().getEditorKit(this).getActions();
552569
}
553-
}
570+
}

‎client/src/com/mirth/connect/client/ui/components/rsta/MirthRSyntaxTextArea.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ TOGGLE_COMMENT.Name=Toggle Comment
118118
TOGGLE_COMMENT.Desc=Comments / uncomments the current selected line(s).
119119
TOGGLE_COMMENT.Toggle=false
120120

121+
FORMAT_CODE.Mnemonic=F
122+
FORMAT_CODE.Name=Format
123+
FORMAT_CODE.Desc=Format the current script / selected line(s).
124+
FORMAT_CODE.Toggle=false
125+
121126
VIEW_USER_API.Mnemonic=V
122127
VIEW_USER_API.Name=View User API
123128
VIEW_USER_API.Desc=Opens up the User API Javadoc in a browser.

‎client/src/com/mirth/connect/client/ui/components/rsta/RSTAPreferences.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ private void setDefaultKeyStrokeMap() {
234234
putKeyStroke(ActionInfo.FOLD_EXPAND_ALL, KeyEvent.VK_MULTIPLY, defaultModifier);
235235
putKeyStroke(ActionInfo.GO_TO_MATCHING_BRACKET, KeyEvent.VK_OPEN_BRACKET, defaultModifier);
236236
putKeyStroke(ActionInfo.TOGGLE_COMMENT, KeyEvent.VK_SLASH, defaultModifier);
237+
putKeyStroke(ActionInfo.FORMAT_CODE, KeyEvent.VK_F, ctrl + shift);
237238
putKeyStroke(ActionInfo.AUTO_COMPLETE, KeyEvent.VK_SPACE, ctrl);
238239

239240
if (isOSX) {

‎client/src/com/mirth/connect/client/ui/components/rsta/actions/ActionInfo.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public enum ActionInfo {
4040
DISPLAY_WRAP_LINES ("mirth-wrap-lines"),
4141
GO_TO_MATCHING_BRACKET (RSyntaxTextAreaEditorKit.rstaGoToMatchingBracketAction),
4242
TOGGLE_COMMENT (RSyntaxTextAreaEditorKit.rstaToggleCommentAction),
43+
FORMAT_CODE ("mirth-format-code"),
4344
VIEW_USER_API ("mirth-view-user-api"),
4445
AUTO_COMPLETE ("AutoComplete"),
4546
DOCUMENT_START (DefaultEditorKit.beginAction),

0 commit comments

Comments
 (0)