Skip to content

Commit

Permalink
Prepare for version 0.11.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@groboclown
groboclown committed Jul 30, 2020
1 parent 0f5f67e commit 6018c1b
Show file tree
Hide file tree
Showing 13 changed files with 307 additions and 114 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

### Overview

* Warning about IDE 2018 and earlier.
* Warning about IDE before 2018.2.
* Upgraded older libraries.
* Created a bill of materials.
* Build improvements
Expand Down
2 changes: 1 addition & 1 deletion plugin-v3/src/main/java/net/groboclown/p4plugin/messages/CompatibilityCheck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static boolean isIdeaVersionValid(String majorStr, String minorStr) {
// It's a supported version for a while.
return true;
}
if (major == DEPRECATED_SUPPORT__MINOR && minor >= DEPRECATED_SUPPORT__MINOR) {
if (major == DEPRECATED_SUPPORT__MAJOR && minor >= DEPRECATED_SUPPORT__MINOR) {
// It's a supported version for a while
return true;
}
Expand Down
44 changes: 33 additions & 11 deletions plugin-v3/src/main/java/net/groboclown/p4plugin/ui/history/ChangelistDetails.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
import org.jetbrains.annotations.Nullable;

import javax.swing.*;
import javax.swing.border.TitledBorder;
import java.awt.*;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.ResourceBundle;

Expand Down Expand Up @@ -232,7 +234,7 @@ public String valueOf(P4Job j) {
label1.setFont(label1Font);
}
this.$$$loadLabelText$$$(label1,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.title"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.title"));
panel1.add(label1, cc.xy(1, 3, CellConstraints.RIGHT, CellConstraints.DEFAULT));
myDate = new JLabel();
myDate.setText("Label");
Expand All @@ -245,20 +247,20 @@ public String valueOf(P4Job j) {
panel1.add(myClientname, cc.xy(7, 5));
final JLabel label2 = new JLabel();
this.$$$loadLabelText$$$(label2,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.author"));
label2.setToolTipText(ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle")
.getString("changelist.details.author.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.author"));
label2.setToolTipText(this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle",
"changelist.details.author.tooltip"));
panel1.add(label2, cc.xy(5, 3, CellConstraints.RIGHT, CellConstraints.DEFAULT));
final JLabel label3 = new JLabel();
this.$$$loadLabelText$$$(label3,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.date"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.date"));
panel1.add(label3, cc.xy(1, 5, CellConstraints.RIGHT, CellConstraints.DEFAULT));
myAuthor = new JLabel();
myAuthor.setText("Label");
panel1.add(myAuthor, cc.xy(7, 3));
final JLabel label4 = new JLabel();
this.$$$loadLabelText$$$(label4,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.client"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.client"));
panel1.add(label4, cc.xy(5, 5, CellConstraints.RIGHT, CellConstraints.DEFAULT));
final JPanel panel2 = new JPanel();
panel2.setLayout(new BorderLayout(0, 0));
Expand All @@ -269,15 +271,17 @@ public String valueOf(P4Job j) {
myFilesPanel.setLayout(new BorderLayout(0, 0));
root.add(myFilesPanel, cc.xy(1, 5));
myFilesPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.files")));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.files"),
TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
final JScrollPane scrollPane1 = new JScrollPane();
myFilesPanel.add(scrollPane1, BorderLayout.CENTER);
scrollPane1.setViewportView(myFiles);
myJobsPanel = new JPanel();
myJobsPanel.setLayout(new BorderLayout(0, 0));
root.add(myJobsPanel, cc.xy(1, 9));
myJobsPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.jobs")));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.jobs"),
TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
final JScrollPane scrollPane2 = new JScrollPane();
myJobsPanel.add(scrollPane2, BorderLayout.CENTER);
scrollPane2.setViewportView(myJobs);
Expand All @@ -288,15 +292,15 @@ public String valueOf(P4Job j) {
.setLayout(new FormLayout("fill:d:grow", "center:d:grow,top:4dlu:noGrow,center:max(d;4px):noGrow"));
root.add(myNoFilesPanel, cc.xy(1, 7));
final JLabel label5 = new JLabel();
this.$$$loadLabelText$$$(label5, ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle")
.getString("changelist.details.files.none"));
this.$$$loadLabelText$$$(label5,
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.files.none"));
myNoFilesPanel.add(label5, cc.xy(1, 3));
myNoJobsPanel = new JPanel();
myNoJobsPanel.setLayout(new FormLayout("fill:d:grow", "center:d:noGrow"));
root.add(myNoJobsPanel, cc.xy(1, 11));
final JLabel label6 = new JLabel();
this.$$$loadLabelText$$$(label6,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("changelist.details.jobs.none"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "changelist.details.jobs.none"));
myNoJobsPanel.add(label6, cc.xy(1, 1));
}

Expand All @@ -322,6 +326,23 @@ public String valueOf(P4Job j) {
size >= 0 ? size : currentFont.getSize());
}

private static Method $$$cachedGetBundleMethod$$$ = null;

private String $$$getMessageFromBundle$$$(String path, String key) {
ResourceBundle bundle;
try {
Class<?> thisClass = this.getClass();
if ($$$cachedGetBundleMethod$$$ == null) {
Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass("com.intellij.DynamicBundle");
$$$cachedGetBundleMethod$$$ = dynamicBundleClass.getMethod("getBundle", String.class, Class.class);
}
bundle = (ResourceBundle) $$$cachedGetBundleMethod$$$.invoke(null, path, thisClass);
} catch (Exception e) {
bundle = ResourceBundle.getBundle(path);
}
return bundle.getString(key);
}

/**
* @noinspection ALL
*/
Expand Down Expand Up @@ -357,4 +378,5 @@ public String valueOf(P4Job j) {
public JComponent $$$getRootComponent$$$() {
return root;
}

}
27 changes: 24 additions & 3 deletions plugin-v3/src/main/java/net/groboclown/p4plugin/ui/history/ChooseLabelDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -215,9 +216,9 @@ public void windowClosing(WindowEvent e) {
panel4.add(mySearchField, cc.xy(1, 3, CellConstraints.FILL, CellConstraints.DEFAULT));
mySearchButton = new JButton();
this.$$$loadButtonText$$$(mySearchButton,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("search.label.search-button"));
mySearchButton.setToolTipText(ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle")
.getString("search.label.search-button.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "search.label.search-button"));
mySearchButton.setToolTipText(this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle",
"search.label.search-button.tooltip"));
panel4.add(mySearchButton, cc.xy(3, 3));
panel4.add(mySearchSpinner, cc.xy(5, 3));
final JPanel panel5 = new JPanel();
Expand All @@ -229,6 +230,23 @@ public void windowClosing(WindowEvent e) {
scrollPane1.setViewportView(mySearchResults);
}

private static Method $$$cachedGetBundleMethod$$$ = null;

private String $$$getMessageFromBundle$$$(String path, String key) {
ResourceBundle bundle;
try {
Class<?> thisClass = this.getClass();
if ($$$cachedGetBundleMethod$$$ == null) {
Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass("com.intellij.DynamicBundle");
$$$cachedGetBundleMethod$$$ = dynamicBundleClass.getMethod("getBundle", String.class, Class.class);
}
bundle = (ResourceBundle) $$$cachedGetBundleMethod$$$.invoke(null, path, thisClass);
} catch (Exception e) {
bundle = ResourceBundle.getBundle(path);
}
return bundle.getString(key);
}

/**
* @noinspection ALL
*/
Expand Down Expand Up @@ -258,6 +276,9 @@ public void windowClosing(WindowEvent e) {
}
}

/**
* @noinspection ALL
*/
public JComponent $$$getRootComponent$$$() {
return contentPane;
}
Expand Down
49 changes: 35 additions & 14 deletions plugin-v3/src/main/java/net/groboclown/p4plugin/ui/submit/SubmitPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
import org.jetbrains.annotations.Nullable;

import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
Expand Down Expand Up @@ -180,8 +182,9 @@ public String valueOf(P4Job p4Job) {
createUIComponents();
myRoot = new JPanel();
myRoot.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1, true, false));
myRoot.setBorder(BorderFactory.createTitledBorder(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("submit.job.title")));
myRoot.setBorder(BorderFactory.createTitledBorder(null,
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "submit.job.title"),
TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
final JScrollPane scrollPane1 = new JScrollPane();
scrollPane1.setHorizontalScrollBarPolicy(31);
myRoot.add(scrollPane1,
Expand All @@ -202,42 +205,42 @@ public String valueOf(P4Job p4Job) {
0, false));
final JLabel label1 = new JLabel();
this.$$$loadLabelText$$$(label1,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.id"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.id"));
label1.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.id.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.id.tooltip"));
CellConstraints cc = new CellConstraints();
panel1.add(label1, cc.xy(1, 3, CellConstraints.RIGHT, CellConstraints.DEFAULT));
myJobIdField = new JTextField();
myJobIdField.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.id.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.id.tooltip"));
panel1.add(myJobIdField, cc.xy(3, 3, CellConstraints.FILL, CellConstraints.DEFAULT));
myAddButton = new JButton();
this.$$$loadButtonText$$$(myAddButton,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.add"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.add"));
myAddButton.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.add.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.add.tooltip"));
panel1.add(myAddButton, cc.xy(5, 3));
final JLabel label2 = new JLabel();
this.$$$loadLabelText$$$(label2,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.resolve"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.resolve"));
label2.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.resolve.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.resolve.tooltip"));
panel1.add(label2, cc.xy(1, 5));
myResolveState = new JComboBox();
myResolveState.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.resolve.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.resolve.tooltip"));
panel1.add(myResolveState, cc.xy(3, 5));
myBrowseButton = new JButton();
this.$$$loadButtonText$$$(myBrowseButton,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.browse"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.browse"));
myBrowseButton.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.browse.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.browse.tooltip"));
panel1.add(myBrowseButton, cc.xy(7, 3));
myRemoveButton = new JButton();
this.$$$loadButtonText$$$(myRemoveButton,
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.remove"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.remove"));
myRemoveButton.setToolTipText(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("job.panel.remove.tooltip"));
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "job.panel.remove.tooltip"));
panel1.add(myRemoveButton, cc.xy(7, 5));
final Spacer spacer1 = new Spacer();
myRoot.add(spacer1,
Expand All @@ -247,6 +250,23 @@ public String valueOf(P4Job p4Job) {
label2.setLabelFor(myResolveState);
}

private static Method $$$cachedGetBundleMethod$$$ = null;

private String $$$getMessageFromBundle$$$(String path, String key) {
ResourceBundle bundle;
try {
Class<?> thisClass = this.getClass();
if ($$$cachedGetBundleMethod$$$ == null) {
Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass("com.intellij.DynamicBundle");
$$$cachedGetBundleMethod$$$ = dynamicBundleClass.getMethod("getBundle", String.class, Class.class);
}
bundle = (ResourceBundle) $$$cachedGetBundleMethod$$$.invoke(null, path, thisClass);
} catch (Exception e) {
bundle = ResourceBundle.getBundle(path);
}
return bundle.getString(key);
}

/**
* @noinspection ALL
*/
Expand Down Expand Up @@ -311,4 +331,5 @@ public String valueOf(P4Job p4Job) {
public JComponent $$$getRootComponent$$$() {
return myRoot;
}

}
28 changes: 24 additions & 4 deletions plugin-v3/src/main/java/net/groboclown/p4plugin/ui/swarm/SwarmReviewPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@
import org.jetbrains.annotations.Nullable;

import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
Expand Down Expand Up @@ -320,15 +322,16 @@ private FileRow(FilePath name) {
final JPanel panel1 = new JPanel();
panel1.setLayout(new BorderLayout(0, 0));
root.add(panel1, BorderLayout.SOUTH);
panel1.setBorder(BorderFactory.createTitledBorder(
ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle").getString("swarm.create.description")));
panel1.setBorder(BorderFactory.createTitledBorder(null,
this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle", "swarm.create.description"),
TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
final JScrollPane scrollPane2 = new JScrollPane();
panel1.add(scrollPane2, BorderLayout.CENTER);
descriptionTextArea = new JTextArea();
descriptionTextArea.setLineWrap(true);
descriptionTextArea.setRows(4);
descriptionTextArea.setToolTipText(ResourceBundle.getBundle("net/groboclown/p4plugin/P4Bundle")
.getString("swarm.create.description.tooltip"));
descriptionTextArea.setToolTipText(this.$$$getMessageFromBundle$$$("net/groboclown/p4plugin/P4Bundle",
"swarm.create.description.tooltip"));
descriptionTextArea.setWrapStyleWord(true);
scrollPane2.setViewportView(descriptionTextArea);
final JPanel panel2 = new JPanel();
Expand All @@ -342,6 +345,23 @@ private FileRow(FilePath name) {
panel2.add(label1, cc.xy(1, 1));
}

private static Method $$$cachedGetBundleMethod$$$ = null;

private String $$$getMessageFromBundle$$$(String path, String key) {
ResourceBundle bundle;
try {
Class<?> thisClass = this.getClass();
if ($$$cachedGetBundleMethod$$$ == null) {
Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass("com.intellij.DynamicBundle");
$$$cachedGetBundleMethod$$$ = dynamicBundleClass.getMethod("getBundle", String.class, Class.class);
}
bundle = (ResourceBundle) $$$cachedGetBundleMethod$$$.invoke(null, path, thisClass);
} catch (Exception e) {
bundle = ResourceBundle.getBundle(path);
}
return bundle.getString(key);
}

/**
* @noinspection ALL
*/
Expand Down
Loading

0 comments on commit 6018c1b

Please sign in to comment.