Changeset 3168

Timestamp:

08/05/08 15:56:57 (5 years ago)

Author:

awwalter

Message:

synched with trunk update of ComponentColor? and DPtraceColors

Location:

PP/branches/leap-second-dev-branch/jungle/src/org/trinet/jiggle

Files:

• ComponentColor.java (modified) (2 diffs)
• DPtraceColors.java (modified) (3 diffs)

PP/branches/leap-second-dev-branch/jungle/src/org/trinet/jiggle/ComponentColor.java

@@ -165 +165 @@
             if ( ! key.startsWith("color.seedchan")) continue; // discriminate from "catalog" or other color type -aww 2008/06/11
             // TEMP logic here - switch old style "color.seedchan.XX" type to XX.wave prop for input -aww 2008/08/02
+            c = props.getColor(key); // getColor() returns null if unparseable
             if (key.length() == 17) {
                 key = key.substring(15) + ".wave";
@@ -170 +171 @@
             }
             else key = key.substring(15);
-
-            ComponentColor.put(key.intern(), props.getColor(key)); // getColor() returns null if unparseable
+            ComponentColor.put(key.intern(), c);
         }
     }

PP/branches/leap-second-dev-branch/jungle/src/org/trinet/jiggle/DPtraceColors.java

@@ -171 +171 @@
 
     private MyColorButton makeColorButton(final String label, final Color colorFG, final Color colorBG) {
+
+        final boolean isPanel = label.endsWith(".panel");
+        final boolean isWave = label.endsWith(".wave");
+
         final MyColorButton jb = new MyColorButton();
         jb.setActionCommand(label);
@@ -181 +185 @@
                   final class MyJLabel extends JLabel implements ChangeListener {
 
+                      boolean isPanel = false;
+
                       public MyJLabel() { super(); }
                       public MyJLabel(String str) { super(str); }
 
                       public void stateChanged(ChangeEvent evt) {
-                          //MyJLabel.this.setBackground(jcc.getColor());
-                          MyJLabel.this.setForeground(jcc.getSelectionModel().getSelectedColor());
+                          if (isPanel) MyJLabel.this.setBackground(jcc.getSelectionModel().getSelectedColor());
+                          else MyJLabel.this.setForeground(jcc.getSelectionModel().getSelectedColor());
                           MyJLabel.this.repaint();
                       }
@@ -193 +199 @@
                   JPanel jp = new JPanel();
                   jp.setBorder( BorderFactory.createTitledBorder(jb.getActionCommand()) );
-                  jlbl2.setForeground(jcc.getColor());
-                  Color bgcolor = colorBG; 
+
+                  if (isWave) {
+                      jlbl2.setForeground(jcc.getColor());
+                  }
+                  else if (isPanel) {
+                      jlbl2.isPanel = true;
+                      jlbl2.setBackground(jcc.getColor());
+                  }
+
+                  Color ccolor = colorBG; 
                   int keyIdx = label.lastIndexOf(".");
-                  String key =  label.substring(0,keyIdx+1)+"panel";
-                  //System.out.println("DEBUG DPtraceColors bg key is : " + key);
-                  if (bgcolor == null) bgcolor = newProps.getColor(key);
-                  jlbl2.setBackground(((bgcolor == null) ? Color.white : bgcolor));
+                  String key =  label.substring(0, keyIdx);
+                  if (isWave) {
+                      key += ".panel";
+                  }
+                  else if (isPanel) {
+                      key += ".wave";
+                  }
+
+                  //System.out.println("DEBUG DPtraceColors key is : " + key);
+                  if (ccolor == null) ccolor = newProps.getColor(key);
+                  if (label.endsWith(".wave")) {
+                      jlbl2.setBackground(((ccolor == null) ? Color.white : ccolor));
+                  }
+                  else if (label.endsWith(".panel")) {
+                      jlbl2.setForeground(((ccolor == null) ? Color.white : ccolor));
+                  }
+
                   jlbl2.setOpaque(true);
                   jlbl2.setPreferredSize(new Dimension(275,20));