SQLDEV-2076 More cleanup

Author: bjeffrie

sqldeveloper/extension/java/ConnectionHelper/src/oracle/db/example/sqldeveloper/extension/connectionHelper/ConnectionHelper.java

@@ -40,13 +40,13 @@ public class ConnectionHelper {
 
 /**
  * Process each command line argument as a potential connection request
+ * looking for -conName=user[/[pw]]@host:port(:sid|/svc)[#role]
  */
 publicstaticvoidprocessCommandLineArgs() {
 if (!processedCommandLineArgs) {
 String[] args = Ide.getIdeArgs().getArgs();
 booleanpersist = ConnectionHelperPreferenceModel.getInstance().isPersistCommandLineConnections();
 for (Stringarg : args) {
-System.out.println(arg);
 ConnectionHelper.processPotentialConnectionArgument(arg, persist);
  }
 processedCommandLineArgs = true;
@@ -55,7 +55,7 @@ public static void processCommandLineArgs() {
 
 /**
  * Process the string received by the ConnectionHelperServer as a potential connection request
- * @param arg
+ * @param arg connection info. format = -conName=user[/[pw]]@host:port(:sid|/svc)[#role]
  */
 publicstaticvoidprocessPotentialConnectionRequest(Stringarg) {
 processPotentialConnectionArgument(arg, ConnectionHelperPreferenceModel.getInstance().isPersistExternalConnectionServerConnections());

sqldeveloper/extension/java/ConnectionHelper/src/oracle/db/example/sqldeveloper/extension/connectionHelper/ConnectionHelperAddin.java

@@ -16,11 +16,17 @@
 
 packageoracle.db.example.sqldeveloper.extension.connectionHelper;
 
-importoracle.dbtools.util.Logger;
+importstaticoracle.db.example.sqldeveloper.extension.connectionHelper.ConnectionHelperPreferenceModel.COMMAND_LINE_ACCEPT_CONN;
+importstaticoracle.db.example.sqldeveloper.extension.connectionHelper.ConnectionHelperPreferenceModel.EXT_CONN_SVR_AUTOSTART;
+importstaticoracle.db.example.sqldeveloper.extension.connectionHelper.ConnectionHelperPreferenceModel.EXT_CONN_SVR_PORT;
+
 importoracle.ide.Addin;
 importoracle.ide.Ide;
 importoracle.ide.IdeEvent;
 importoracle.ide.IdeListener;
+importoracle.javatools.data.ChangeInfo;
+importoracle.javatools.data.StructureChangeEvent;
+importoracle.javatools.data.StructureChangeListener;
 
 /**
  * ConnectionHelperAddin
@@ -30,13 +36,10 @@
  */
 publicclassConnectionHelperAddinimplementsAddin {
 
-/* (non-Javadoc)
- * @see oracle.ide.Addin#initialize()
- */
 @Override
 publicvoidinitialize() {
-Logger.info(getClass(), "Initialize"); // TODO REMOVE
-addIdeListener();// Don't do any checking now, need system initialized first.
+addIdeListener();
+addPreferenceListener();
  }
 
 @SuppressWarnings("deprecation")
@@ -45,10 +48,11 @@ private void addIdeListener() {
 
 @Override
 publicvoidmainWindowOpened(IdeEvente) {
-if (ConnectionHelperPreferenceModel.getInstance().isAcceptCommandLineConnections()) {
+ConnectionHelperPreferenceModelmodel = ConnectionHelperPreferenceModel.getInstance();
+if (model.isAcceptCommandLineConnections()) {
 ConnectionHelper.processCommandLineArgs();
  }
-if (ConnectionHelperPreferenceModel.getInstance().isAutostartExternalConnectionServer()) {
+if (model.isAutostartExternalConnectionServer()) {
 ConnectionHelperServer.start();
  }
  }
@@ -59,4 +63,35 @@ public void addinsLoaded(IdeEvent e) {} // No longer fired see IdeEvent.IDE_ADDI
 publicvoidmainWindowClosing(IdeEvente) {} // Don't care
  });
  }
+
+privatevoidaddPreferenceListener() {
+ConnectionHelperPreferenceModel.getInstance().addStructureChangeListener(newStructureChangeListener() {
+@Override
+publicvoidstructureValuesChanged(StructureChangeEvente) {
+for (ChangeInfochange : e.getChangeDetails()) {
+switch(change.getPropertyName()) {
+caseCOMMAND_LINE_ACCEPT_CONN: 
+if (change.getNewValueAsBoolean()) {
+ConnectionHelper.processCommandLineArgs();
+ }
+break;
+caseEXT_CONN_SVR_AUTOSTART:
+if (change.getNewValueAsBoolean()) {
+ConnectionHelperServer.start();
+ }
+break;
+caseEXT_CONN_SVR_PORT:
+if (ConnectionHelperServer.isRunning()) {
+ConnectionHelperServer.stop();
+ConnectionHelperServer.start();
+ }
+break;
+default: 
+break; // nothing 
+ }
+ }
+ }
+ });
+ }
+
 }

sqldeveloper/extension/java/ConnectionHelper/src/oracle/db/example/sqldeveloper/extension/connectionHelper/ConnectionHelperPreferenceModel.java

@@ -29,15 +29,15 @@
  */
 publicclassConnectionHelperPreferenceModelextendsHashStructureAdapter {
 
-privatestaticfinalStringDATA_KEY = ConnectionHelperPreferenceModel.class.getName();
+staticfinalStringDATA_KEY = ConnectionHelperPreferenceModel.class.getName();
 
-privatestaticfinalStringCOMMAND_LINE_ACCEPT_CONN = "COMMAND_LINE_ACCEPT_CONN"; //$NON-NLS-1$
-privatestaticfinalStringCOMMAND_LINE_PERSIST_CONN = "COMMAND_LINE_PERSIST_CONN"; //$NON-NLS-1$
+staticfinalStringCOMMAND_LINE_ACCEPT_CONN = "COMMAND_LINE_ACCEPT_CONN"; //$NON-NLS-1$
+staticfinalStringCOMMAND_LINE_PERSIST_CONN = "COMMAND_LINE_PERSIST_CONN"; //$NON-NLS-1$
 
-privatestaticfinalStringEXT_CONN_SVR_PORT = "EXT_CONN_SVR_PORT"; //$NON-NLS-1$
-privatestaticfinalIntegerEXT_CONN_SVR_DEFAULT_PORT = 51521; // 49152-65535 https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=1&page=24
-privatestaticfinalStringEXT_CONN_SVR_AUTOSTART = "EXT_CONN_SVR_AUTOSTART"; //$NON-NLS-1$
-privatestaticfinalStringEXT_CONN_SVR_PERSIST_CONN = "EXT_CONN_SVR_PERSIST_CONN"; //$NON-NLS-1$
+staticfinalStringEXT_CONN_SVR_PORT = "EXT_CONN_SVR_PORT"; //$NON-NLS-1$
+staticfinalIntegerEXT_CONN_SVR_DEFAULT_PORT = 51521; // 49152-65535 https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=1&page=24
+staticfinalStringEXT_CONN_SVR_AUTOSTART = "EXT_CONN_SVR_AUTOSTART"; //$NON-NLS-1$
+staticfinalStringEXT_CONN_SVR_PERSIST_CONN = "EXT_CONN_SVR_PERSIST_CONN"; //$NON-NLS-1$
 
 privateConnectionHelperPreferenceModel(HashStructurehash) {
 super(hash);

sqldeveloper/extension/java/ConnectionHelper/src/oracle/db/example/sqldeveloper/extension/connectionHelper/ConnectionHelperPreferencePanel.java

@@ -62,16 +62,16 @@ private void layoutControls() {
 // The more I think about it, I like this better than buttons. Maybe better than 
 // the listener but the listener would also demonstrate how to listen for preference
 // changes.
-clAcceptConn.addActionListener(e -> {
-if (clAcceptConn.isSelected()) {
-ConnectionHelper.processCommandLineArgs();
- }
- });
-svrAutostart.addActionListener(e -> {
-if (svrAutostart.isSelected()) {
-ConnectionHelperServer.start();
- }
- });
+// clAcceptConn.addActionListener(e -> {
+// if (clAcceptConn.isSelected()) {
+// ConnectionHelper.processCommandLineArgs();
+// }
+// });
+// svrAutostart.addActionListener(e -> {
+// if (svrAutostart.isSelected()) {
+// ConnectionHelperServer.start();
+// }
+// });
 
 finalFieldLayoutBuilderbuilder = newFieldLayoutBuilder(this);
 builder.setAlignLabelsLeft(true);

sqldeveloper/extension/java/ConnectionHelper/src/oracle/db/example/sqldeveloper/extension/connectionHelper/ConnectionHelperServer.java

@@ -43,11 +43,12 @@ public class ConnectionHelperServer {
 privatestaticfinalStringNAME_TEMPLATE = "%s-%d"; //$NON-NLS-1$
 
 publicstaticvoidstart() {
-stop();
-intport = ConnectionHelperPreferenceModel.getInstance().getExternalConnectionServerPort();
-serverTask = newServerTask(String.format(NAME_TEMPLATE, ConnectionHelperServer.class.getSimpleName(), port), port);
-listening = true;
-RaptorTaskManager.getInstance().addTask(serverTask);
+if (!listening) {
+intport = ConnectionHelperPreferenceModel.getInstance().getExternalConnectionServerPort();
+serverTask = newServerTask(String.format(NAME_TEMPLATE, ConnectionHelperServer.class.getSimpleName(), port), port);
+listening = true;
+RaptorTaskManager.getInstance().addTask(serverTask);
+ }
  }
 
 publicstaticvoidstop() {
@@ -57,6 +58,10 @@ public static void stop() {
  }
  }
 
+publicstaticbooleanisRunning() {
+returnlistening && null == serverTask;
+ }
+
 privatestaticclassServerTaskextendsRaptorTask<Void> {
 privateintport;
 privateServerSocketsocket; // reference for cancel()
@@ -73,6 +78,8 @@ public ServerTask(String name, int port) {
 publicbooleancancel() {
 if (socket != null) {
 try {
+listening = false;
+serverTask = null;
 socket.close();
  } catch (IOExceptione) {
 Logger.ignore(getClass(), e);
@@ -88,6 +95,8 @@ protected Void doWork() throws TaskException {
 while (listening) {
 checkCanProceed();
 this.setMessage("Waiting for connection");
+// accept() listens for a connection to be made to this socket and accepts it. 
+// The method blocks until a connection is made.
 ConnectionHelperTaskhelperTask = newConnectionHelperTask(serverSocket.accept()); 
 this.setMessage("Initializing ConnectionHelperTask");
 RaptorTaskManager.getInstance().addTask(helperTask);
@@ -145,7 +154,7 @@ protected Void doWork() throws TaskException {
 
  }
 
-publicstaticTaskExceptionasTaskException(Throwablet) {
+privatestaticTaskExceptionasTaskException(Throwablet) {
 if (tinstanceofTaskException) {
 return (TaskException)t;
  } else {