Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a2a8032

Browse filesBrowse files
author
y4zhang
committed
add uuid to configuration
1 parent 6bff7c5 commit a2a8032
Copy full SHA for a2a8032

2 files changed

+11-1Lines changed: 11 additions & 1 deletion

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

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

Copy file name to clipboardExpand all lines: drjava/src/edu/rice/cs/drjava/DrJava.java
+8-1Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ public static void main(final String[] args) {
250250

251251
public static void configureAndLoadDrJavaRoot(String[] args) {
252252
try {
253+
System.out.println("r");
253254
// if there were files passed on the command line,
254255
// try to open them in an existing instance
255256
if (!_forceNewInstance &&
@@ -265,6 +266,7 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
265266
int failCount = 0;
266267
while(failCount < 2) {
267268
// Restart if there are custom JVM args
269+
System.out.println("y");
268270
String masterMemory = getConfig().getSetting(MASTER_JVM_XMX).trim();
269271
boolean _doRestart = (getConfig().getSetting(MASTER_JVM_ARGS).length() > 0)
270272
|| (!"".equals(masterMemory) && !OptionConstants.heapSizeChoices.get(0).equals(masterMemory));
@@ -286,7 +288,8 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
286288
clearFilesToOpen();
287289
_log.log("_filesToOpen copied into class arguments, clearing _filesToOpen");
288290
}
289-
291+
/*not use
292+
*/
290293
if (_doRestart) {
291294
if (DrJava.getConfig().getSetting(OptionConstants.REMOTE_CONTROL_ENABLED)) {
292295
// at this time, OUR remote control server hasn't been started yet
@@ -299,6 +302,7 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
299302

300303
// Run a new copy of DrJava and exit
301304
try {
305+
//System.out.println("rrr");
302306
boolean failed = false;
303307
JVMBuilder jvmb = JVMBuilder.DEFAULT.jvmArguments(_jvmArgs);
304308

@@ -314,6 +318,7 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
314318

315319
// start new DrJava
316320
Process p = jvmb.start(DrJavaRoot.class.getName(), classArgs);
321+
// System.out.println("yy");
317322
_alreadyRestarted = true;
318323
_log.log("_alreadyRestarted = true");
319324
DelayedInterrupter timeout = new DelayedInterrupter(WAIT_BEFORE_DECLARING_SUCCESS);
@@ -370,6 +375,8 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
370375
}
371376

372377
else {
378+
System.out.println("yy!");
379+
//System.out.println(DrJava.getConfig().getSetting(OptionConstants.UUID));
373380
// No restart -- just invoke DrJavaRoot.main.
374381
DrJavaRoot.main(classArgs.toArray(new String[0]));
375382
// when we return from here, DrJavaRoot._mainFrame has been initialized
Collapse file

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

Copy file name to clipboardExpand all lines: drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ public interface OptionConstants {
6868
/** A file path to a user's preferred browser. */
6969
public static final FileOption BROWSER_FILE = new FileOption("browser.file", FileOps.NULL_FILE);
7070

71+
/** A file path to a user's preferred browser. */
72+
public static final StringOption UUID = new StringOption("uuid.string","");
73+
7174
/** A String used to launch a user's preferred browser. It is tokenized and appended to the file path. */
7275
public static final StringOption BROWSER_STRING = new StringOption("browser.string", "");
7376

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.