/ - Diff - Library: org.gvsig.tools - gvSIG

+        }
         @Override
         public void addClearButton(JComboBox combo) {
                 try {
                 JTextComponent text = (JTextComponent) combo.getEditor().getEditorComponent();
                 this.addClearButton(text, null);
             } catch(Throwable th) {
                 // Si no puede a?adir el boton no hace nada.
+            }
+        }
         @Override
         public void addClearButton(final JTextComponent text,  final ActionListener action) {
             final JButton btnClear = new JButton(getIcon("picker-cleartext"));
             btnClear.setBorderPainted( false );
-...
             text.addPropertyChangeListener(new PropertyChangeListener() {
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     if( evt!=null && evt.getPropertyName().equalsIgnoreCase("enabled") ) {
                     if( evt==null ) {
                         return;
+                    }
                     if( evt.getPropertyName().equalsIgnoreCase("enabled") ) {
                         boolean enabled = text.isEnabled();
                         btnClear.setEnabled(enabled);
                     } else if( evt.getPropertyName().equalsIgnoreCase("editable") ) {
                         boolean editable = text.isEditable();
                         btnClear.setEnabled(editable);
+                    }
+                }
             });

         public void addClearButton(final JTextComponent text);
         public void addClearButton(JComboBox combo);
         public SimpleImage createSimpleImage();
         public SimpleImage createSimpleImage(Object source);

                 <dependency>
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
                     <version>1.6</version>
                     <version>1.8</version>
                 </dependency>
                 <dependency>
                     <groupId>commons-io</groupId>

             public boolean isInNewState();
             public void addAction(Action action);
             public void setActionVisible(String action, boolean visible);
             public void setActionEnabled(String action, boolean enabled);
             public boolean isActionVisible(String action);
             public boolean isActionEnabled(String action);
     	public void addActionToPopupMenu(DataType tipo, String name, Action action);
     	public void addSeparatorToPopupMenu(DataType tipo);

         private DynFormDefinition definition = null;
         private int layoutMode = USE_PLAIN;
         private JLabel jlabel_messages = null;
         private boolean readOnly = false;
         private boolean readOnly = true;
         private Set listeners = null;
         private boolean useScrollBars = true;
         private final Map<String, List<Action>> customActions;

+        }
         protected void fireFieldChangedEvent() {
             if( this.isReadOnly() ) {
                 return;
+            }
             Iterator it = this.listeners.iterator();
             while (it.hasNext()) {
                 JDynFormFieldListener listener = (JDynFormFieldListener) it.next();

     import java.util.Collection;
     import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormField;
     @SuppressWarnings({"unchecked", "rawtypes"})
     @SuppressWarnings({"unchecked", "rawtypes", "UseSpecificCatch"})
     public class DefaultJDynForm extends AbstractJDynForm implements JDynFormFieldListener {
         private Map components = null;
-...
                 if (jfield instanceof AbstractJDynFormField) {
                     ((AbstractJDynFormField) jfield).setForm(this);
+                }
                 jfield.setReadOnly(fieldDefinition.isReadOnly());
                 jfield.addListener(this);
                 if (this.isReadOnly()) {
                     jfield.setReadOnly(this.isReadOnly());
                     jfield.setReadOnly(true);
                 } else {
                     jfield.setReadOnly(fieldDefinition.isReadOnly());
+                }
                 jfield.addListener(this);
                 builder.append(jfield.getJLabel(), jfield.asJComponent());
                 this.components.put(jfield.getName(), jfield);
-...
         @Override
         public void setReadOnly(boolean readOnly) {
             if( this.isReadOnly() == readOnly ) {
                 return;
+            }
             super.setReadOnly(readOnly);
             if (this.isContentsInitialized()) {
                 Iterator it = this.getFieldsIterator();
-...
                     if (fields[i].getDataType().getType() == DataTypes.LIST) {
                         try {
                             if (((DynField_v2) fields[i]).getDynClassOfItems() != null) {
                                 values.setDynValue(name, new ArrayList<DynObject>());
                                 values.setDynValue(name, new ArrayList<>());
+                            }
                         } catch (Exception e) {
                             logger.warn("Problems initializing the DynObject List", e);
-...
             fireFieldChangeEvent(field);
+        }
         @Override
         public JDynFormField getField(String fieldName) {
             JDynFormField field = (JDynFormField) this.components.get(fieldName);
             return field;

     import javax.swing.JComboBox;
     import javax.swing.JTextField;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormFieldWithValueList;
     import org.gvsig.tools.dynobject.DynObject;
-...
     		Object value = null;
     		if( this.contents instanceof JTextField ) {
     			String s = getJTextField().getText();
     			if( s.trim().length()==0 ) {
     			if( StringUtils.isBlank(s) ) {
     				value = this.getDefinition().getDefaultValue();
     			} else {
     				try {

     		return "";
+    	}
     	public Object getValue() {
     		Object value = null;
     		String s = this.getValueFromJComponent();
     		if( StringUtils.isBlank(s) ) {
     			Object x = this.getDefinition().getDefaultValue();
     			if( x != null ) {
                                 value = x.toString();
+    			}
     		} else {
     			value = s;
+    		}
     		return value;
+    	}
         @Override
         public Object getValue() {
             Object value = null;
             String s = this.getValueFromJComponent();
             if (StringUtils.isBlank(s)) {
                 if (this.assignedValue != null) {
                     Object x = this.getDefinition().getDefaultValue();
                     if (x != null) {
                         value = x.toString();
+                    }
+                }
             } else {
                 value = s;
+            }
             return value;
+        }
+    }

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.services/src/main/java/org/gvsig/tools/dynform/services/dynformfield/Date/JDynFormFieldDate.java
175	175	}
176	176	}
177	177	if (this.contents instanceof JPanel && this.contents.getName().equalsIgnoreCase(DATE_PANEL_NAME)) {
178		this.getJSpinner().setValue(value);
	178	try {
	179	this.getJSpinner().setValue(value);
	180	} catch(Exception ex) {
	181
	182	}
179	183	}
180	184	this.assignedValue = value;
181	185	}

     import java.awt.event.FocusListener;
     import javax.swing.JTextField;
     import org.apache.commons.codec.binary.Hex;
     import org.gvsig.tools.dynform.JDynFormField;
     import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormField;
-...
     				s = value.toString();
+    			}
     		} else {
     			s = value.toString();
                         if( value instanceof byte[] ) {
                             s = Hex.encodeHexString((byte[]) value);
                         } else {
                             s = value.toString();
+                        }
+    		}
     		this.getJTextField().setText(s);
     		this.assignedValue = value;
-...
+    	}
     	public void setReadOnly(boolean readonly) {
     		this.getJTextField().setEditable(false);;
                 super.setReadOnly(false);
                 this.getJTextField().setEditable(false);;
+    	}
     	public boolean isReadOnly() {

     import java.awt.BorderLayout;
     import java.awt.Color;
     import java.awt.Component;
     import java.awt.event.MouseAdapter;
     import java.awt.event.MouseEvent;
     import java.util.ArrayList;
-...
     import java.util.List;
     import javax.swing.Action;
     import javax.swing.BorderFactory;
     import javax.swing.BoxLayout;
     import javax.swing.JComponent;
     import javax.swing.JLabel;
-...
             if (this.contents == null) {
                 try {
                     this.initComponents();
                     if (this.buttonBar != null) {
                         this.buttonBar.setReadOnly(this.isReadOnly());
+                    }
                     if (this.form != null) {
                         this.form.setReadOnly(this.isReadOnly());
+                    }
                 } catch (ServiceException e) {
                     throw new RuntimeException(e.getLocalizedMessage(), e);
+                }
-...
             this.contents.setLayout(new BorderLayout());
             this.form = this.manager.getDynFormManager().createJDynForm(definition);
             this.form.setReadOnly(this.isReadOnly());
             this.form.setLayoutMode(this.getLayoutMode());
             this.form.setUseScrollBars(this.getUseScrollBars());
             this.form.addListener(this);
-...
             this.buttonBar.setActionActive(FormSetButtonBar.ActionSearch, this.allowSearch());
             this.buttonBar.setActionActive(FormSetButtonBar.ActionClose, this.allowClose());
             this.buttonBar.setVisible(FormSetButtonBar.ActionCancelNew, false);
             this.contents.add(this.buttonBar.asJComponent(), BorderLayout.NORTH);
             this.buttonBar.setReadOnly(this.isReadOnly());
             this.contents.add(this.form.asJComponent(), BorderLayout.CENTER);
             this.contents.add(this.getMessagesJLabel(), BorderLayout.SOUTH);
             JPanel p = new JPanel();
             p.setLayout(new BoxLayout(p, BoxLayout.PAGE_AXIS));
             this.buttonBar.asJComponent().setAlignmentX(Component.LEFT_ALIGNMENT);
             this.getMessagesJLabel().setAlignmentX(Component.LEFT_ALIGNMENT);
             p.add(this.buttonBar.asJComponent());
             p.add(this.getMessagesJLabel());
             this.contents.add(p, BorderLayout.SOUTH);
             doChangeValues();
+        }
-...
         @Override
         public void setReadOnly(boolean readOnly) {
     //        if( this.isReadOnly() == readOnly ) {
     //            return;
     //        }
             super.setReadOnly(readOnly);
             if (this.buttonBar != null) {
                 this.buttonBar.setReadOnly(readOnly);
-...
                 throw new RuntimeException("Can't add action to JDymFormSet", ex);
+            }
+        }
         @Override
         public void setActionVisible(String action, boolean visible) {
             try {
                 this.getButtonBar().setVisible(action, visible);
             } catch (Exception ex) {
                 throw new RuntimeException("Can't action visible in JDymFormSet", ex);
+            }
+        }
         @Override
         public void setActionEnabled(String action, boolean enabled) {
             try {
                 this.getButtonBar().setEnabled(action, enabled);
             } catch (Exception ex) {
                 throw new RuntimeException("Can't action enable in JDymFormSet", ex);
+            }
+        }
         @Override
         public boolean isActionEnabled(String action) {
             try {
                 return this.getButtonBar().isEnabled(action);
             } catch (Exception ex) {
                 throw new RuntimeException("Can't get action enable in JDymFormSet", ex);
+            }
+        }
         @Override
         public boolean isActionVisible(String action) {
             try {
                 return this.getButtonBar().isVisible(action);
             } catch (Exception ex) {
                 throw new RuntimeException("Can't get action visible in JDymFormSet", ex);
+            }
+        }
+    }

     import java.awt.event.ActionListener;
     import java.net.URL;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Map;
     import java.util.Objects;
     import java.util.Set;
     import javax.swing.Action;
     import javax.swing.BorderFactory;
-...
         private JPanel othersButtons;
         private final List<Action> otherActions;
         private final Map<String,JButton> otherButtons;
         private boolean readOnly = false;
-...
+            }
             this.listeners = new HashSet();
             this.otherActions = new ArrayList<>();
             this.otherButtons = new HashMap<>();
+        }
         @Override
-...
+            }
+        }
         public void setVisible(String id, boolean visible) {
             JButton button = this.otherButtons.get(id);
             if( button == null ) {
                 return;
+            }
             button.setVisible(visible);
+        }
         public void setEnabled(String id, boolean enabled) {
             JButton button = this.otherButtons.get(id);
             if( button == null ) {
                 return;
+            }
             button.setEnabled(enabled);
+        }
         public boolean isEnabled(String id) {
             JButton button = this.otherButtons.get(id);
             if( button == null ) {
                 throw new IllegalArgumentException("Don't exists action '"+id+"'.");
+            }
             return button.isEnabled();
+        }
         public boolean isVisible(String id) {
             JButton button = this.otherButtons.get(id);
             if( button == null ) {
                 throw new IllegalArgumentException("Don't exists action '"+id+"'.");
+            }
             return button.isVisible();
+        }
         public void setCurrent(int current) {
             this.current = current;
             updateRecords();
-...
         public void setReadOnly(boolean readOnly) {
             this.readOnly = readOnly;
             for (int i = 0; i < buttons.length; i++) {
                 if (isActionActive(i) && this.buttons[i] != null) {
                     this.buttons[i].setEnabled(!readOnly);
+                }
                 if (!readOnly) {
                     updateRecords();
+                }
+            }
             this.setEnabled(ActionSave, !readOnly);
             this.setEnabled(ActionNew, !readOnly);
             this.setEnabled(ActionCancelNew, !readOnly);
             this.setEnabled(ActionDelete, !readOnly);
             this.setEnabled(ActionSearch, true);
             this.setEnabled(ActionClose, true);
             updateRecords();
+        }
         public void addAction(Action action) {
-...
             button.setFocusPainted(false);
             button.setContentAreaFilled(false);
             button.setCursor(new Cursor(Cursor.HAND_CURSOR));
             String id = Objects.toString(action.getValue(Action.ACTION_COMMAND_KEY), null);
             if( !StringUtils.isEmpty(id) ) {
                 this.otherButtons.put(id, button);
+            }
             this.othersButtons.add(button);
+        }

         public void addAction(Action action) {
             logger.info("AddAction not implemented over SimpleTableJDynFormSet.");
+        }
         @Override
         public void setActionEnabled(String action, boolean enabled) {
             logger.info("setActionEnabled not implemented over SimpleTableJDynFormSet.");
+        }
         @Override
         public void setActionVisible(String action, boolean visible) {
             logger.info("setActionVisible not implemented over SimpleTableJDynFormSet.");
+        }
         @Override
         public boolean isActionEnabled(String action) {
             logger.info("isActionEnabled not implemented over SimpleTableJDynFormSet.");
             return true;
+        }
         @Override
         public boolean isActionVisible(String action) {
             logger.info("isActionVisible not implemented over SimpleTableJDynFormSet.");
             return true;
+        }
         public static class DynObjectListTableModel implements TableModel{

                 <artifactId>formsrt</artifactId>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
                 <scope>compile</scope>
             </dependency>
         </dependencies>
     </project>

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/dynobject/impl/DefaultDynObjectManager.java
802	802	targetField.copyFrom(sourceField);
803	803	}
804	804	try {
805		for (DynMethod sourceMethod : source.getDynMethods()) {
806		target.addDynMethod(sourceMethod);
	805	DynMethod[] x = source.getDynMethods();
	806	if( x!=null ) {
	807	for (DynMethod sourceMethod : x) {
	808	target.addDynMethod(sourceMethod);
	809	}
807	810	}
808	811	} catch (DynMethodException ex) {
809	812	}

                 if( other2.isAvailableValuesCalculated() ) {
                     this.availableValuesMethod = other2.getAvailableValuesMethod();
                 } else {
                     this.availableValues = other.getAvailableValues().clone();
                     DynObjectValueItem[] x = other.getAvailableValues();
                     if( x != null ) {
                     this.availableValues = x.clone();
+                    }
+                }
                 this.setType(other.getDataType());
                 this.setClassOfValue(other2.getClassOfValue());
                 this.setClassOfValue(other2.getDynClassOfValue());
                 this.setTypeOfItems(other2.getTypeOfItems());
                 this.setClassOfItems(other2.getClassOfItems());
                 this.setClassOfItems(other2.getDynClassOfItems());
                 this.itemsType.setType(other2.getTypeOfItems());
                 this.itemsType.setClassOfValue(other2.getClassOfItems());
                 this.itemsType.setClassOfValue(other2.getDynClassOfItems());
+            }
+        }

Application: gvSIG desktop » Library: org.gvsig.tools

Revision 1862