Changeset 1102 for trunk/src/org/expeditee/settings/network/proxy/ProxySettings.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/settings/network/proxy/ProxySettings.java (modified) (4 diffs)

trunk/src/org/expeditee/settings/network/proxy/ProxySettings.java

@@ -23 +23 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
+import org.expeditee.items.widgets.JavaFXSwingWidget;
 import org.expeditee.items.widgets.Password;
 import org.expeditee.items.widgets.WidgetCorner;
@@ -52 +53 @@
                                                 if (passwordWidget == null) {
                                                         try {
-                                                                passwordWidget = (Password) InteractiveWidget.createWidget((Text) i);
+                                                                passwordWidget = (Password) Widget.createWidget((Text) i);
                                                                 if (Pass.get() != null) {
                                                                         // MessageBay.displayMessage("pass was defined multiple times!", Color.ORANGE);
@@ -65 +66 @@
                         } else if(i instanceof WidgetCorner || i instanceof WidgetEdge) {
                                 if(passwordWidget == null) {
-                                        InteractiveWidget iw;
+                                        Widget iw;
                                         if(i instanceof WidgetCorner) {
                                                 iw = ((WidgetCorner)i).getWidgetSource();
@@ -73 +74 @@
                                         if(iw instanceof Password) {
                                                 passwordWidget = (Password) iw;
+                                        } else if (iw instanceof JavaFXSwingWidget && ((JavaFXSwingWidget) iw).getSwingWidget() instanceof Password) {
+                                                passwordWidget = (Password) ((JavaFXSwingWidget) iw).getSwingWidget();
                                         }
                                         if(Pass.get() != null) {