/trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/ColorChooserPanel.java - Diff - | gvSIG desktop 1 - gvSIG

Revision 20779 trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/panels/ColorChooserPanel.java

     import javax.swing.JCheckBox;
     import javax.swing.JColorChooser;
     import javax.swing.JFrame;
     import javax.swing.JLabel;
     import javax.swing.JPanel;
     import javax.swing.JSlider;
     import javax.swing.SwingUtilities;
-...
         private Dimension dim2 = new Dimension(dim.width, dim.height*2+5);
         private ArrayList<ActionListener> actionListeners = new ArrayList<ActionListener>();
         private boolean withTransp;
         private boolean withNoFill;
         private boolean withTranspPerc;
     	private boolean withNoFill;
         private JCheckBox chkUseColor;
     	private JSlider sldTransparency;
         private boolean muteSldTransparency = false;
     	private JLabel lblTransparency;
     	private boolean muteSldTransparency = false;
     	private double perc = 0.392156863 ;/*100/255*/
     	private ChangeListener sldAction = new ChangeListener() {
     		public void stateChanged(ChangeEvent e) {
     			if (!muteSldTransparency) {
     				int alphaValue = sldTransparency.getValue();
     				setAlpha(alphaValue);
     				if(withTranspPerc) {
     					int percValue = (int) (alphaValue * perc);
     					lblTransparency.setText(" " + String.valueOf(percValue));
+    				}
     				fireActionPerformed();
+    			}
+    		}
     	};
         public ColorChooserPanel() {
             this(false);
+        }
         /**
     	 * Constructor method
+    	 *
     	 * @param withTransparencySlider boolean that specifies if the user
     	 * wants a slider with the color chooser panel to control the transparency
     	 * of the selected color.Also, it will appear a text which specifies the transparency percentage.
     	 * @param withNoFill boolean that specifies if the color chooser panel
     	 * allows a null value for the color selected (true case). If this values
     	 * is false, when the color selected is null then black color is assigned
     	 * automatically.
     	 */
         public ColorChooserPanel(boolean withTransparencySlider) {
         	this(withTransparencySlider,false);
-...
     	public ColorChooserPanel(boolean withTransparencySlider, boolean withNoFill) {
     		this.withTransp=withTransparencySlider;
     		this.withTranspPerc=withTransparencySlider;
     		this.withNoFill=withNoFill;
     		try {
-...
     				int width = withNoFill ? dim2.width - 40 : dim2.width;
     				sldTransparency.setPreferredSize(new Dimension(width, dim2.height/2));
     				sldTransparency.setToolTipText(PluginServices.getText(this, "transparencia"));
     				if(withTranspPerc) {
     					lblTransparency = new JLabel();
     					int percValue = (int) (sldTransparency.getValue() * perc);
     					lblTransparency.setText(" " + String.valueOf(percValue));
     					lblTransparency.setPreferredSize(new Dimension(30,20));
+    				}
     				sldTransparency.setValue(255);
+    			}
     			jbInit();
     			colorPanel.setLineColor(null);
-...
     		if(withNoFill) {
     			chkUseColor = new JCheckBox();
     			chkUseColor.setSelected(true);
     			c.fill = GridBagConstraints.HORIZONTAL;
     			c.gridwidth = 1;
     			c.gridx = 0;
-...
+    		}
     		if (withTransp) {
     			c.fill = GridBagConstraints.HORIZONTAL;
-...
     			c.gridx = 1;
     			c.gridy = 1;
     			pane.add(sldTransparency,c);
     			if(withTranspPerc) {
     				c.fill = GridBagConstraints.HORIZONTAL;
     				c.gridwidth = 3;
     				c.gridx = 4;
     				c.gridy = 1;
     				pane.add(lblTransparency,c);
+    			}
+    		}
     		add(pane);
-...
     	 * @param e Action Event
     	 */
     	private void useColor_actionPerformed(ActionEvent e) {
     		if(chkUseColor.isSelected())
     			setColor(color);
     		else setColor(null);
     		fireActionPerformed();
+    	}
          public void addActionListener(ActionListener l) {
             actionListeners.add(l);
+        }
         public void removeActionListener(ActionListener l) {
             actionListeners.remove(l);
+        }
         protected void fireActionPerformed() {
             for (Iterator<ActionListener> i = actionListeners.iterator(); i.hasNext();) {
                 i.next().actionPerformed(new ActionEvent(this, 0, null));
+            }
+        }
     	/**
     	 * Sets the color of the chooser panel.
+    	 *
-...
     	 */
     	public void setColor(Color color) {
     		this.color = color;
     		if( color != null)
     		if( color != null) {
     			this.color = color;
     			setAlpha(color.getAlpha());
     			updateColorPanel();
+    		}
     		updateColorPanel();
+    	}
     	/**
-...
     		if (withTransp) {
     			sldTransparency.setValue(alpha);
     			sldTransparency.validate();
     			int percValue = (int) (alpha * perc);
     			lblTransparency.setText(" " + String.valueOf(percValue));
+    		}
     		updateColorPanel();
     		muteSldTransparency = false;
     		fireActionPerformed();
+    	}
     	public int getAlpha() {
-...
             colorPanel.repaint();
+        }
         public void addActionListener(ActionListener l) {
             actionListeners.add(l);
+        }
         public void removeActionListener(ActionListener l) {
             actionListeners.remove(l);
+        }
         protected void fireActionPerformed() {
             for (Iterator<ActionListener> i = actionListeners.iterator(); i.hasNext();) {
                 i.next().actionPerformed(new ActionEvent(this, 0, null));
+            }
+        }
     	/**
     	 * Obtains the selected color in the color chooser panel.
+    	 *
-...
     		if(withTransp) {
     			sldTransparency.setEnabled(newEnabled);
+    		}
     		if(withTranspPerc) {
     			lblTransparency.setEnabled(newEnabled);
+    		}
     		if(withNoFill) {
     			chkUseColor.setEnabled(newEnabled);
+    		}

Also available in: Unified diff