/ - Diff - Application: gvSIG desktop - gvSIG

Revision 42836

         static private int eventId = Integer.MIN_VALUE;
         private Long lastValue = null;
         // jaume
         private class ComboScaleItem {
             private long value;
             private boolean temporal;
             public ComboScaleItem(long itemScale) {
                 this.value = itemScale;
                 this.temporal=false;
+            }
             public ComboScaleItem(long itemScale, boolean temporal) {
                 this.value = itemScale;
                 this.temporal=temporal;
+            }
             public String toString() {
                 return NumberFormat.getNumberInstance().format(value);
+            }
-...
             public long getValue() {
                 return value;
+            }
             public boolean isTemporal(){
                 return temporal;
+            }
+        }
         /**
-...
         /**
          * This method initializes this
+         *
+         *
          * @return void
          */
         private void initialize() {
-...
         /**
          * This method initializes jComboBox
+         *
+         *
          * @return javax.swing.JComboBox
          */
         private JComboBox getJComboBox() {
-...
+            }
             return jComboBox;
+        }
     	public Object getValue() {
     		return lastValue;
+    	}
-...
         /**
          * This funcion ONLY sets the text in combo. It will NOT call listeners.
+         *
+         *
          * @param scale
          */
         public void setScale(long item) {
         public void setScale(long scale) {
             bDoCallListeners = false;
             getJComboBox().setSelectedItem(new ComboScaleItem(item));
             getJComboBox().setSelectedItem(new ComboScaleItem(scale));
             bDoCallListeners = true;
             DefaultComboBoxModel model =
                 (DefaultComboBoxModel) jComboBox.getModel();
             //The item is inserted in the data model but marked as temporal
             //Only one temporal can be in the data model
             for (int i = 0; i < model.getSize(); i++) {
                 ComboScaleItem itemScale = (ComboScaleItem) model.getElementAt(i);
                 if (itemScale.isTemporal()) {
                     model.removeElement(itemScale);
                     break;
+                }
+            }
             insertScaleIfNotPresent(scale, true);
+        }
         /**
          * @param scale
          */
         private void insertScaleIfNotPresent(long scale) {
             // Si viene de un setScale, no insertamos la escala en el combo
         private void insertScaleIfNotPresent(long scale, boolean isTemporal) {
          // Si viene de un setScale, no insertamos la escala en el combo
             if (!bDoCallListeners)
                 return;
-...
                     break;
+                }
+            }
             ComboScaleItem newScaleItem = new ComboScaleItem(scale, isTemporal);
             if (!inserted) {
                 for (int i = 0; i < model.getSize(); i++) {
                     ComboScaleItem itemScale =
                         (ComboScaleItem) model.getElementAt(i);
                     if (scale < itemScale.getValue()) {
                         model.insertElementAt(new ComboScaleItem(scale), i);
                         model.insertElementAt(newScaleItem, i);
                         inserted = true;
                         break;
+                    }
+                }
                 if (!inserted)
                     model.addElement(new ComboScaleItem(scale));
                     model.addElement(newScaleItem);
+            }
             jComboBox.setSelectedItem(new ComboScaleItem(scale));
             jComboBox.setSelectedItem(newScaleItem);
             isScaleCombo = true;
+        }
         /**
          * @param scale
          */
         private void insertScaleIfNotPresent(long scale) {
             insertScaleIfNotPresent(scale, false);
+        }
         private void callActionCommandListeners(long scale) {
             if (!bDoCallListeners)
                 return;
-...
         /**
          * Returns the current selected item.
+         *
+         *
          * @return The value of the selected scale, or -1 if there was an invalid
          *         value (ie. not long value).
          */

Also available in: Unified diff