Skip to content

Commit 7144a04

Browse files
author
rcartwright
committed
This revision:
(i) eliminates many archaic uses of invokeLater/invokeAndWait dictated by our former synchronization policies on documents; (ii) adds many isDispatchThread assertions; (iii) strengthens the leak test in DefinitionsPaneTest(restoring the confirmation that all DefinitionPanes and adds new code that attempts to force more thorough garbage collection. The following files were modified: M src/edu/rice/cs/drjava/DrJava.java M src/edu/rice/cs/drjava/DrJavaRestart.java M src/edu/rice/cs/drjava/model/BrowserHistoryManager.java M src/edu/rice/cs/drjava/model/debug/jpda/DocumentDebugAction.java M src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java M src/edu/rice/cs/drjava/model/debug/jpda/DebugAction.java M src/edu/rice/cs/drjava/model/debug/jpda/PendingRequestManager.java M src/edu/rice/cs/drjava/model/debug/jpda/Step.java M src/edu/rice/cs/drjava/model/debug/jpda/JPDABreakpoint.java M src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java M src/edu/rice/cs/drjava/model/GlobalModelTestCase.java M src/edu/rice/cs/drjava/model/GlobalModel.java M src/edu/rice/cs/drjava/model/definitions/indent/ActionStartPrevStmtPlus.java M src/edu/rice/cs/drjava/model/definitions/indent/QuestionNewParenPhraseTest.java M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java M src/edu/rice/cs/drjava/model/definitions/reducedmodel/TokenList.java M src/edu/rice/cs/drjava/model/definitions/DefinitionsEditorKit.java M src/edu/rice/cs/drjava/model/ClassAndInterfaceFinder.java M src/edu/rice/cs/drjava/model/MovingDocumentRegion.java M src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java M src/edu/rice/cs/drjava/model/repl/InteractionsModel.java M src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java M src/edu/rice/cs/drjava/model/repl/newjvm/InterpretResult.java M src/edu/rice/cs/drjava/model/AbstractDJDocument.java M src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java M src/edu/rice/cs/drjava/model/compiler/CompilerErrorModel.java M src/edu/rice/cs/drjava/model/compiler/LanguageLevelStackTraceMapper.java M src/edu/rice/cs/drjava/model/ClipboardHistoryModel.java M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java M src/edu/rice/cs/drjava/model/print/PagePrinter.java M src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java M src/edu/rice/cs/drjava/model/BrowserDocumentRegion.java M src/edu/rice/cs/drjava/model/SingleDisplayModel.java M src/edu/rice/cs/drjava/RemoteControlServer.java M src/edu/rice/cs/drjava/config/UnaryOpProperty.java M src/edu/rice/cs/drjava/config/DrJavaProperty.java M src/edu/rice/cs/drjava/config/FileListProperty.java M src/edu/rice/cs/drjava/config/FileProperty.java M src/edu/rice/cs/drjava/config/ConfigOptionListeners.java M src/edu/rice/cs/drjava/config/BinaryOpProperty.java M src/edu/rice/cs/drjava/config/DrJavaPropertySetup.java M src/edu/rice/cs/drjava/config/QuaternaryOpProperty.java M src/edu/rice/cs/drjava/config/PropertyMaps.java M src/edu/rice/cs/drjava/config/OptionParseException.java M src/edu/rice/cs/drjava/config/TernaryOpProperty.java M src/edu/rice/cs/drjava/config/VectorOption.java M src/edu/rice/cs/drjava/config/OptionMapLoader.java M src/edu/rice/cs/drjava/project/XMLProjectFileParser.java M src/edu/rice/cs/drjava/project/ProjectFileParserFacade.java M src/edu/rice/cs/drjava/project/ProjectProfile.java M src/edu/rice/cs/drjava/RemoteControlClient.java M src/edu/rice/cs/drjava/ui/MainFrame.java M src/edu/rice/cs/drjava/ui/ExternalProcessPanel.java M src/edu/rice/cs/drjava/ui/InteractionsPane.java M src/edu/rice/cs/drjava/ui/EditExternalDialog.java M src/edu/rice/cs/drjava/ui/RecentFileManager.java M src/edu/rice/cs/drjava/ui/KeyBindingManager.java M src/edu/rice/cs/drjava/ui/DefinitionsPane.java M src/edu/rice/cs/drjava/ui/JarOptionsDialog.java M src/edu/rice/cs/drjava/ui/DrJavaSurveyPopup.java M src/edu/rice/cs/drjava/ui/ErrorPanel.java M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModel.java M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModelTest.java M src/edu/rice/cs/drjava/ui/predictive/PredictiveInputFrame.java M src/edu/rice/cs/drjava/ui/ErrorCaretListener.java M src/edu/rice/cs/drjava/ui/NewVersionPopup.java M src/edu/rice/cs/drjava/ui/config/VectorAbsRelFileOptionComponent.java M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java M src/edu/rice/cs/drjava/ui/config/ConfigPanel.java M src/edu/rice/cs/drjava/ui/config/VectorFileOptionComponent.java M src/edu/rice/cs/drjava/ui/config/VectorOptionComponent.java M src/edu/rice/cs/drjava/ui/config/OptionComponent.java M src/edu/rice/cs/drjava/ui/AbstractDJPane.java M src/edu/rice/cs/drjava/ui/InsertVariableDialog.java M src/edu/rice/cs/drjava/ui/ProjectMenuTest.java M src/edu/rice/cs/drjava/ui/MainFrameTest.java M src/edu/rice/cs/drjava/ui/BreakpointsPanel.java M src/edu/rice/cs/drjava/ui/InteractionsPaneTest.java M src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java M src/edu/rice/cs/drjava/ui/RecentDocFrame.java M src/edu/rice/cs/drjava/ui/FindResultsPanel.java M src/edu/rice/cs/drjava/ui/RegionsListPanel.java M src/edu/rice/cs/drjava/ui/ExecuteExternalDialog.java M src/edu/rice/cs/drjava/ui/AboutDialog.java M src/edu/rice/cs/drjava/ui/FindReplacePanel.java M src/edu/rice/cs/drjava/ui/LineEnumRule.java M src/edu/rice/cs/drjava/ui/InteractionsController.java M src/edu/rice/cs/drjava/ui/BookmarksPanel.java M src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java M src/edu/rice/cs/drjava/ui/LessPanel.java M src/edu/rice/cs/drjava/ui/ClipboardHistoryFrame.java M src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java M src/edu/rice/cs/util/FileOps.java M src/edu/rice/cs/util/docnavigation/JListSortNavigator.java M src/edu/rice/cs/util/docnavigation/JTreeSortNavigator.java M src/edu/rice/cs/util/swing/CheckBoxJList.java M src/edu/rice/cs/util/swing/LayeredIcon.java M src/edu/rice/cs/util/swing/FileSelectorComponent.java M src/edu/rice/cs/util/swing/UtilitiesTest.java M src/edu/rice/cs/util/ReaderWriterLockTest.java M src/edu/rice/cs/util/ProcessChain.java M src/edu/rice/cs/util/XMLConfig.java M src/edu/rice/cs/util/StringOpsTest.java M src/edu/rice/cs/util/StringOps.java M src/edu/rice/cs/util/JoinInputStream.java M src/edu/rice/cs/util/GeneralProcessCreator.java M src/edu/rice/cs/util/ProcessSequence.java M src/edu/rice/cs/util/RunnableEST.java M src/edu/rice/cs/util/BalancingStreamTokenizer.java M src/edu/rice/cs/util/ProcessCreator.java git-svn-id: file:///tmp/test-svn/trunk@5003 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 72a0d44 commit 7144a04

File tree

110 files changed

+1913
-1704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1913
-1704
lines changed

‎drjava/src/edu/rice/cs/drjava/DrJava.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
152152
// try to open them in an existing instance
153153
if (!_forceNewInstance &&
154154
DrJava.getConfig().getSetting(edu.rice.cs.drjava.config.OptionConstants.REMOTE_CONTROL_ENABLED) &&
155-
(_filesToOpen.size()>0)) {
155+
(_filesToOpen.size() > 0)) {
156156
try {
157157
RemoteControlClient.openFile(null);
158158
if (RemoteControlClient.isServerRunning()) {
159159
// existing instance is running and responding
160-
for (int i=0; i<_filesToOpen.size(); ++i) {
160+
for (int i = 0; i < _filesToOpen.size(); ++i) {
161161
RemoteControlClient.openFile(new File(_filesToOpen.get(i)));
162162
}
163163
// files opened in existing instance, quit
@@ -470,7 +470,7 @@ public static boolean warnIfLinuxWithCompiz() {
470470
BufferedReader br = new BufferedReader(new InputStreamReader(psProc.getInputStream()));
471471
boolean compiz = false;
472472
String line = null;
473-
while((line=br.readLine())!=null) {
473+
while((line=br.readLine()) != null) {
474474
// find the PID of JUnitTestRunner, i.e. the PID of the current process
475475
if ((line.endsWith("compiz")) ||
476476
(line.endsWith("compiz.real"))) {

‎drjava/src/edu/rice/cs/drjava/DrJavaRestart.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static void message(String message) {
6262

6363
}
6464
public static boolean delete(File f) {
65-
for(int i=0; i<ATTEMPTS; ++i) {
65+
for(int i = 0; i < ATTEMPTS; ++i) {
6666
if (f.delete()) return true;
6767
LOG.log("Failed to delete "+f+", trying again");
6868
try {
@@ -73,7 +73,7 @@ public static boolean delete(File f) {
7373
return false;
7474
}
7575
public static boolean deleteRecursively(File f) {
76-
for(int i=0; i<ATTEMPTS; ++i) {
76+
for(int i = 0; i < ATTEMPTS; ++i) {
7777
if (edu.rice.cs.plt.io.IOUtil.deleteRecursively(f)) return true;
7878
LOG.log("Failed to recursively delete "+f+", trying again");
7979
try {
@@ -84,7 +84,7 @@ public static boolean deleteRecursively(File f) {
8484
return false;
8585
}
8686
public static boolean rename(File from, File to) {
87-
for(int i=0; i<ATTEMPTS; ++i) {
87+
for(int i = 0; i < ATTEMPTS; ++i) {
8888
if (from.renameTo(to)) return true;
8989
LOG.log("Failed to rename "+from+" to "+to+", trying again");
9090
try {

‎drjava/src/edu/rice/cs/drjava/RemoteControlClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class RemoteControlClient {
6060
* @return true if running
6161
*/
6262
public static synchronized boolean isServerRunning() {
63-
if (_serverRunning==null) {
63+
if (_serverRunning == null) {
6464
try {
6565
openFile(null);
6666
}
@@ -86,7 +86,7 @@ public static synchronized boolean openFile(File f) throws IOException {
8686

8787
// send request
8888
String dString = RemoteControlServer.QUERY_PREFIX;
89-
if (f!=null) {
89+
if (f != null) {
9090
dString = dString+" "+f.getAbsolutePath();
9191
}
9292
byte[] buf = dString.getBytes();
@@ -123,7 +123,7 @@ public static synchronized boolean openFile(File f) throws IOException {
123123
/** Main method for test purposes.
124124
*/
125125
public static void main(String[] args) {
126-
for (int i=0; i<args.length; ++i) {
126+
for (int i = 0; i < args.length; ++i) {
127127
try {
128128
boolean ret = openFile(new File(args[i]));
129129
System.out.println("openFile returned "+ret);

‎drjava/src/edu/rice/cs/drjava/RemoteControlServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void run() {
127127
request = request.substring(QUERY_PREFIX.length());
128128

129129
// check if a file was specified
130-
if ((request.length()>0) && (request.charAt(0)==' ')) {
130+
if ((request.length() > 0) && (request.charAt(0) == ' ')) {
131131
request = request.substring(1);
132132

133133
// check if the request contained a line number

‎drjava/src/edu/rice/cs/drjava/config/BinaryOpProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public BinaryOpProperty(String name,
9797
* @param pm PropertyMaps used for substitution when replacing variables */
9898
public void update(PropertyMaps pm) {
9999
P op1;
100-
if (_attributes.get(_op1Name)==null) {
100+
if (_attributes.get(_op1Name) == null) {
101101
_value = "("+_name+" Error...)";
102102
return;
103103
}
@@ -111,7 +111,7 @@ public void update(PropertyMaps pm) {
111111
}
112112
}
113113
Q op2;
114-
if (_attributes.get(_op2Name)==null) {
114+
if (_attributes.get(_op2Name) == null) {
115115
_value = "("+_name+" Error...)";
116116
return;
117117
}

‎drjava/src/edu/rice/cs/drjava/config/ConfigOptionListeners.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static void sanitizeSlaveJVMArgs(JFrame parent,
8080
final OptionListener<String> l) {
8181
int pos = value.indexOf("-Xmx");
8282
if (((pos>1) && (Character.isWhitespace(value.charAt(pos-1)))) ||
83-
(pos==0)) {
83+
(pos == 0)) {
8484
int endpos = pos+("-Xmx".length());
8585
while(endpos<value.length() && (! Character.isWhitespace(value.charAt(endpos)))) {
8686
++endpos;
@@ -167,7 +167,7 @@ public void optionChanged(OptionEvent<String> oe) {
167167
}
168168
});
169169
DrJava.getConfig().setSetting(SLAVE_JVM_ARGS, newValue);
170-
if (result==0) {
170+
if (result == 0) {
171171
// copy
172172
DrJava.getConfig().setSetting(SLAVE_JVM_XMX, newSetting);
173173
}
@@ -213,7 +213,7 @@ public static void sanitizeSlaveJVMXMX(JFrame parent, String value) {
213213
null,
214214
options,
215215
options[0]);
216-
if (result==0) {
216+
if (result == 0) {
217217
// clean up
218218
DrJava.getConfig().setSetting(SLAVE_JVM_XMX, OptionConstants.heapSizeChoices.get(0));
219219
}
@@ -224,7 +224,7 @@ public static void sanitizeSlaveJVMXMX(JFrame parent, String value) {
224224
/** Return the next bigger heap size setting. */
225225
static String getNextBiggerHeapSize(long heapSizeMB) {
226226
String newSetting = OptionConstants.heapSizeChoices.get(0);
227-
for(int i=1; i<OptionConstants.heapSizeChoices.size(); ++i) {
227+
for(int i=1; i < OptionConstants.heapSizeChoices.size(); ++i) {
228228
try {
229229
newSetting = OptionConstants.heapSizeChoices.get(i);
230230
float choice = new Float(newSetting);
@@ -384,7 +384,7 @@ public static void sanitizeMasterJVMXMX(JFrame parent, String value) {
384384
null,
385385
options,
386386
options[0]);
387-
if (result==0) {
387+
if (result == 0) {
388388
// clean up
389389
DrJava.getConfig().setSetting(MASTER_JVM_XMX, OptionConstants.heapSizeChoices.get(0));
390390
}
@@ -430,7 +430,7 @@ public static void sanitizeJavadocCustomParams(JFrame parent,
430430
options,
431431
options[0]);
432432
if (result!=2) {
433-
if (result==0) {
433+
if (result == 0) {
434434
// copy
435435
if (containsPublic) { DrJava.getConfig().setSetting(JAVADOC_ACCESS_LEVEL, "public"); }
436436
else if (containsProtected) { DrJava.getConfig().setSetting(JAVADOC_ACCESS_LEVEL, "protected"); }
@@ -440,7 +440,7 @@ public static void sanitizeJavadocCustomParams(JFrame parent,
440440
// clean up
441441
String[] params = value.split("(-private|-protected|-package|-public)");
442442
sb = new StringBuilder();
443-
for(int i=0;i<params.length;i++){
443+
for(int i = 0;i < params.length;i++){
444444
if(!params[i].trim().equals("")) { sb.append(params[i].trim()); sb.append(' '); }
445445
}
446446
DrJava.getConfig().setSetting(JAVADOC_CUSTOM_PARAMS, sb.toString().trim());

‎drjava/src/edu/rice/cs/drjava/config/DrJavaProperty.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public DrJavaProperty(String name, String help) {
7575
/** Create a property. */
7676
public DrJavaProperty(String name, String value, String help) {
7777
this(name, help);
78-
if (value==null) { throw new IllegalArgumentException("DrJavaProperty value is null"); }
79-
if (help!=null) { _help = help; }
78+
if (value == null) { throw new IllegalArgumentException("DrJavaProperty value is null"); }
79+
if (help != null) { _help = help; }
8080
_value = value;
8181
_isCurrent = true;
8282
}

0 commit comments

Comments
 (0)