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

Revision 2035

     package org.gvsig.tools.swing.impl;
     import java.awt.Color;
     import java.awt.Component;
     import java.awt.Dimension;
     import java.awt.Graphics;
     import java.awt.Graphics2D;
     import java.awt.LinearGradientPaint;
     import java.awt.Paint;
     import java.awt.geom.Point2D;
     import javax.swing.BorderFactory;
     import javax.swing.Icon;
     import javax.swing.JLabel;
     import javax.swing.UIManager;
     /*
      * Based on portions of code from java.awt.geom.TitledSeparator of the
      * aterai/java-swing-tips project (Copyright (c) 2015 TERAI Atsuhiro)
      * https://github.com/aterai/java-swing-tips/tree/master/TitledSeparator
      */
     public class TitledSeparator extends JLabel {
         private Color color;
         private final String title;
         private final Color target;
         private final int height;
         private final int titlePosition;
         private final int titleJustification;
         public TitledSeparator(String title, int height, int titlePosition, int titleJustification) {
             this(title, null, height, titlePosition, titleJustification);
+        }
         public TitledSeparator(
                 String _title, Color _target, int _height, int _titlePosition, int _titleJustification) {
             super();
             this.title = _title;
             this.target = _target;
             this.height = _height;
             this.titlePosition = _titlePosition;
             this.titleJustification = _titleJustification;
             Icon icon = new Icon() {
                 private int width = -1;
                 private Paint painter1, painter2;
                 @Override
                 public void paintIcon(Component c, Graphics g, int x, int y) {
                     int w = c.getWidth();
                     if (w != width || painter1 == null || painter2 == null || color == null) {
                         width = w;
                         Point2D start = new Point2D.Float(0f, 0f);
                         Point2D end = new Point2D.Float((float) width, 0f);
                         float[] dist = {0.0f, 1.0f};
                         color = getBackground();
                         color = color == null ? UIManager.getColor("Panel.background") : color;
                         Color tc = target == null ? color : target;
                         painter1 = new LinearGradientPaint(
                                 start, end, dist, new Color[]{tc.darker(), color});
                         painter2 = new LinearGradientPaint(
                                 start, end, dist, new Color[]{tc.brighter(), color});
+                    }
                     int h = getIconHeight() / 2;
                     Graphics2D g2 = (Graphics2D) g.create();
                     g2.setPaint(painter1);
                     g2.fillRect(x, y, width, getIconHeight());
                     g2.setPaint(painter2);
                     g2.fillRect(x, y + h, width, getIconHeight() - h);
                     g2.dispose();
+                }
                 @Override
                 public int getIconWidth() {
                     return 200;
                 } //dummy width
                 @Override
                 public int getIconHeight() {
                     return height;
+                }
             };
             this.setBorder(BorderFactory.createTitledBorder(
                     BorderFactory.createMatteBorder(height, 0, 0, 0, icon), title,
                     titleJustification, titlePosition));
+        }
         @Override
         public Dimension getMaximumSize() {
             Dimension d = super.getPreferredSize();
             d.width = Short.MAX_VALUE;
             return d;
+        }
         @Override
         public void updateUI() {
             super.updateUI();
             color = null;
+        }
+    }

     import javax.swing.JTabbedPane;
     import javax.swing.JTextField;
     import javax.swing.JViewport;
     import javax.swing.border.TitledBorder;
     import javax.swing.table.TableModel;
     import javax.swing.text.DefaultEditorKit;
     import javax.swing.text.JTextComponent;
-...
             return model;
+        }
         @Override
         public JLabel createTitledSeparator(String title, int height, int titlePosition, int titleJustification) {
             TitledSeparator c = new TitledSeparator(title, height, titlePosition, titleJustification);
             return c;
+        }
         @Override
         public JLabel createTitledSeparator(String title) {
             TitledSeparator c = new TitledSeparator(
                     title,
 ,
                     TitledBorder.DEFAULT_POSITION,
                     TitledBorder.DEFAULT_JUSTIFICATION
             );
             return c;
+        }
+    }

         public HistoryController createHistoryController(History history, JButton button);
         public FilteredTableModel createFilteredTableModel(TableModel model, int filterColumn);
         public JLabel createTitledSeparator(String title, int height, int titlePosition, int titleJustification);
         public JLabel createTitledSeparator(String title);
+    }

+            }
+        }
         protected List<Action> getCustomFields(DataType dataType) {
         protected List<Action> getCustomActionsForDataType(DataType dataType) {
             return (List<Action>) customActions.get(dataType.getName());
+        }
         @Override
         public void addActionToPopupMenu(DataType tipo, String name, Action action) {
             List<Action> acts = this.getCustomFields(tipo);
             List<Action> acts = this.getCustomActionsForDataType(tipo);
             action.putValue(Action.NAME, name);
             if (acts == null) {
                 List<Action> aux = new ArrayList<>();
-...
         @Override
         public void addSeparatorToPopupMenu(DataType tipo) {
             List<Action> acts = this.getCustomFields(tipo);
             List<Action> acts = this.getCustomActionsForDataType(tipo);
             if (acts == null) {
                 List<Action> aux = new ArrayList<>();
                 aux.add(null);

+        }
         @Override
         public String getSeparatorTitleToUseBefore() {
             String separatorTitle = this.getTagValueAsString(
                     DynFormSPIManager.TAG_DYNFORM_SEPARATOR,
                     null
             );
             return separatorTitle;
+        }
         @Override
         public boolean useEmptyLabel() {
             boolean useEmpty = getTagValueAsBoolean(
                     DynFormSPIManager.TAG_DYNFORM_LABEL_EMPTY,
                     false
             );
             return useEmpty;
+        }
         @Override
         public JComponent getJLabel() {
             if (this.jlabel == null) {
                 this.jlabel = this.getComponentsFactory().getJLabel(definition, null);
                 if( this.jlabel==null ) {
                     this.jlabel = new JLabel();
+                }
                 if (!getTagValueAsBoolean(DynFormSPIManager.TAG_DYNFORM_LABEL_EMPTY, false)) {
                 if (!this.useEmptyLabel() ) {
                     this.jlabel.setText(this.getLabel());
+                }
                 this.jlabel.setLabelFor(this.contents);

      */
     package org.gvsig.tools.dynform.impl;
     import java.awt.Component;
     import org.gvsig.tools.dynform.spi.dynform.AbstractJDynForm;
     import java.util.ArrayList;
     import java.util.HashMap;
-...
     import org.gvsig.tools.dynobject.DynObject;
     import org.gvsig.tools.service.ServiceException;
     import com.jgoodies.forms.builder.DefaultFormBuilder;
     import com.jgoodies.forms.layout.CellConstraints;
     import com.jgoodies.forms.layout.FormLayout;
     import com.jgoodies.forms.layout.RowSpec;
     import java.awt.GridBagConstraints;
     import java.awt.GridBagLayout;
     import java.awt.Insets;
     import java.util.Collection;
     import javax.swing.JLabel;
     import javax.swing.JPanel;
     import org.gvsig.tools.dynform.spi.DynFormSPIManager;
     import org.gvsig.tools.dynform.spi.DynFormSPIManager.ComponentsFactory;
     import static org.gvsig.tools.dynform.spi.DynFormSPIManager.TAG_DYNFORM_SEPARATOR;
     import static org.gvsig.tools.dynform.spi.DynFormSPIManager.USERCODE_FORM_CLEAR;
     import static org.gvsig.tools.dynform.spi.DynFormSPIManager.USERCODE_FORM_ISMODIFIED;
     import static org.gvsig.tools.dynform.spi.DynFormSPIManager.USERCODE_FORM_ISREADONLY;
-...
     import org.gvsig.tools.dynform.spi.dynform.JDynFormFactory;
     import org.gvsig.tools.dynform.spi.dynformfield.JDynFormFieldFactory;
     import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormField;
     import org.gvsig.tools.dynobject.Tags;
     import org.gvsig.tools.i18n.I18nManager;
     import org.gvsig.tools.swing.api.ToolsSwingLocator;
     import org.gvsig.tools.swing.api.ToolsSwingManager;
     @SuppressWarnings("UseSpecificCatch")
     public class DefaultJDynForm extends AbstractJDynForm implements JDynFormFieldListener {
-...
+        }
         private JComponent getFieldsContainerPlain() throws ServiceException {
             FormLayout layout = new FormLayout(
                     "left:pref,  8px,  fill:80dlu:grow", "pref");
             DefaultFormBuilder builder = new DefaultFormBuilder(layout);
             builder.defaultRowSpec(new RowSpec(
                     RowSpec.TOP,
                     builder.getLayout().getRowSpec(1).getSize(),
                     builder.getLayout().getRowSpec(1).getResizeWeight()));
             List fields = this.getDefinition().getDefinitions();
             Iterator it = fields.iterator();
             while (it.hasNext()) {
                 DynFormFieldDefinition fieldDefinition = (DynFormFieldDefinition) it.next();
             ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
             GridBagConstraints c = new GridBagConstraints();
             c.insets = new Insets(2, 2, 2, 2);
             c.anchor = GridBagConstraints.PAGE_START;
             JPanel fieldsPanel = new JPanel();
             fieldsPanel.setLayout(new GridBagLayout());
             int gridy = 0;
             List<DynFormFieldDefinition> fields = this.getDefinition().getDefinitions();
             for (DynFormFieldDefinition fieldDefinition : fields) {
                 if (fieldDefinition.isHidden()) {
                     continue;
+                }
-...
                 if (jfield instanceof AbstractJDynFormField) {
                     ((AbstractJDynFormField) jfield).setForm(this);
+                }
                 jfield.addListener(this);
                 if (this.isReadOnly()) {
                     jfield.setReadOnly(true);
                     jfield.setReadOnly(this.isReadOnly());
+                }
                 List<Action> customActions = getCustomActionsForDataType(fieldDefinition.getDataType());
                 if (customActions != null && !customActions.isEmpty()) {
                     for (Action customAction : customActions) {
                         if (customAction != null) {
                             jfield.addActionToPopupMenu((String) customAction.getValue(Action.NAME), customAction);
                         } else {
                             jfield.addSeparatorToPopupMenu();
+                        }
+                    }
+                }
                 String sep = jfield.getSeparatorTitleToUseBefore();
                 if( !StringUtils.isBlank(sep) ) {
                     c.gridx = 0;
                     c.gridy = gridy;
                     c.gridwidth = 2;
                     c.gridheight = 1;
                     c.fill = GridBagConstraints.HORIZONTAL;
                     c.weightx = 1;
                     c.weighty = 0;
                     fieldsPanel.add(toolsSwingManager.createTitledSeparator(sep), c);
                     gridy++;
+                }
                 if( jfield.useEmptyLabel() ) {
                     c.gridx = 0;
                     c.gridy = gridy;
                     c.gridwidth = 2;
                     c.gridheight = 1;
                 } else {
                     jfield.setReadOnly(fieldDefinition.isReadOnly());
                     c.gridx = 0;
                     c.gridy = gridy;
                     c.gridwidth = 1;
                     c.gridheight = 1;
                     c.fill = GridBagConstraints.HORIZONTAL;
                     c.weightx = 0;
                     c.weighty = 0;
                     jfield.getJLabel().setAlignmentY(Component.TOP_ALIGNMENT);
                     fieldsPanel.add(jfield.getJLabel(), c);
                     c.gridx = 1;
                     c.gridy = gridy;
                     c.gridwidth = 1;
                     c.gridheight = 1;
+                }
                 jfield.addListener(this);
                 double resizeWeight = jfield.getResizeWeight();
                 if( resizeWeight>0 ) {
                     builder.appendRow(new RowSpec(
                         RowSpec.FILL,
                         builder.getLayout().getRowSpec(1).getSize(),
                         resizeWeight)
                     );
                     builder.append(jfield.getJLabel());
                     builder.add(
                             jfield.asJComponent(),
                             new CellConstraints(
                                 builder.getColumn(),
                                 builder.getRow(),
                                 CellConstraints.FILL,
                                 CellConstraints.FILL
+                            )
                     );
                     builder.nextColumn();
                 double weighty = jfield.getResizeWeight();
                 if( weighty>0 ) {
                     c.fill = GridBagConstraints.BOTH;
                     c.weightx = 1;
                     c.weighty = weighty;
                     fieldsPanel.add(jfield.asJComponent(), c);
                 } else {
                     builder.append(jfield.getJLabel(), jfield.asJComponent());
                     c.fill = GridBagConstraints.HORIZONTAL;
                     c.weightx = 1;
                     c.weighty = 0;
                     fieldsPanel.add(jfield.asJComponent(), c);
+                }
                 this.components.put(jfield.getName(), jfield);
                 gridy++;
+            }
             return builder.getPanel();
             return fieldsPanel;
+        }
         private JComponent getFieldsContainerUseSeparators() throws ServiceException {
             ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
             List<String> groups = this.getDefinition().getGroups();
             FormLayout layout = new FormLayout(
                     "left:pref,  8px,  fill:80dlu:grow", "pref");
             DefaultFormBuilder builder = new DefaultFormBuilder(layout);
             builder.defaultRowSpec(new RowSpec(
                     RowSpec.TOP,
                     builder.getLayout().getRowSpec(1).getSize(),
                     builder.getLayout().getRowSpec(1).getResizeWeight()));
             GridBagConstraints c = new GridBagConstraints();
             c.insets = new Insets(2, 2, 2, 2);
             c.anchor = GridBagConstraints.PAGE_START;
             JPanel fieldsPanel = new JPanel();
             fieldsPanel.setLayout(new GridBagLayout());
             int gridy = 0;
             for (String group : groups) {
                 boolean firstfield = true;
                 List fields = this.getDefinition().getDefinitions(group);
                 Iterator it = fields.iterator();
                 while (it.hasNext()) {
                     DynFormFieldDefinition fieldDefinition = (DynFormFieldDefinition) it.next();
                 boolean firstField = true;
                 List<DynFormFieldDefinition> fields = this.getDefinition().getDefinitions(group);
                 for (DynFormFieldDefinition fieldDefinition : fields) {
                     if (fieldDefinition.isHidden()) {
                         continue;
+                    }
-...
                         jfield.setReadOnly(this.isReadOnly());
+                    }
                     List<Action> customActions = getCustomFields(fieldDefinition.getDataType());
                     List<Action> customActions = getCustomActionsForDataType(fieldDefinition.getDataType());
                     if (customActions != null && !customActions.isEmpty()) {
                         Iterator it2 = customActions.iterator();
                         while (it2.hasNext()) {
                             Object obj = it2.next();
                             if (obj != null) {
                                 Action act = (Action) obj;
                                 jfield.addActionToPopupMenu((String) act.getValue(Action.NAME), act);
                         for (Action customAction : customActions) {
                             if (customAction != null) {
                                 jfield.addActionToPopupMenu((String) customAction.getValue(Action.NAME), customAction);
                             } else {
                                 jfield.addSeparatorToPopupMenu();
+                            }
+                        }
+                    }
                     if( firstfield ) {
                         firstfield = false;
                         builder.appendSeparator(group);
                     if( firstField ) {
                         firstField = false;
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 2;
                         c.gridheight = 1;
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 1;
                         c.weighty = 0;
                         fieldsPanel.add(toolsSwingManager.createTitledSeparator(group), c);
                         gridy++;
+                    }
                     double resizeWeight = jfield.getResizeWeight();
                     if( resizeWeight>0 ) {
                         builder.appendRow(new RowSpec(
                             RowSpec.FILL,
                             builder.getLayout().getRowSpec(1).getSize(),
                             resizeWeight)
                         );
                         builder.append(jfield.getJLabel());
                         builder.add(
                                 jfield.asJComponent(),
                                 new CellConstraints(
                                     builder.getColumn(),
                                     builder.getRow(),
                                     CellConstraints.FILL,
                                     CellConstraints.FILL
+                                )
                         );
                         builder.nextColumn();
                     String sep = jfield.getSeparatorTitleToUseBefore();
                     if( !StringUtils.isBlank(sep) ) {
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 2;
                         c.gridheight = 1;
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 1;
                         c.weighty = 0;
                         fieldsPanel.add(toolsSwingManager.createTitledSeparator(sep), c);
                         gridy++;
+                    }
                     if( jfield.useEmptyLabel() ) {
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 2;
                         c.gridheight = 1;
                     } else {
                         builder.append(jfield.getJLabel(), jfield.asJComponent());
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 1;
                         c.gridheight = 1;
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 0;
                         c.weighty = 0;
                         fieldsPanel.add(jfield.getJLabel(), c);
                         c.gridx = 1;
                         c.gridy = gridy;
                         c.gridwidth = 1;
                         c.gridheight = 1;
+                    }
                     double weighty = jfield.getResizeWeight();
                     if( weighty>0 ) {
                         c.fill = GridBagConstraints.BOTH;
                         c.weightx = 1;
                         c.weighty = weighty;
                         fieldsPanel.add(jfield.asJComponent(), c);
                     } else {
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 1;
                         c.weighty = 0;
                         fieldsPanel.add(jfield.asJComponent(), c);
+                    }
                     this.components.put(jfield.getName(), jfield);
                     gridy++;
+                }
+            }
             return builder.getPanel();
             return fieldsPanel;
+        }
         private JComponent getFieldsContainerUseTabs() throws ServiceException {
             JTabbedPane tabbedPane = new JTabbedPane();
             tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
             if (this.getDefinition().getTags().has("TabPlacement")) {
                 try {
                     tabbedPane.setTabPlacement(this.getDefinition().getTags().getInt("TabPlacement"));
-...
                     // Ignorada
+                }
+            }
             ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
             I18nManager i18n = ToolsLocator.getI18nManager();
             List<String> groups = this.getDefinition().getGroups();
             GridBagConstraints c = new GridBagConstraints();
             c.insets = new Insets(2, 2, 2, 2);
             c.anchor = GridBagConstraints.PAGE_START;
             for (String group : groups) {
                 FormLayout layout = new FormLayout(
                         "left:pref,  8px,  fill:80dlu:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
                 builder.defaultRowSpec(new RowSpec(
                         RowSpec.TOP,
                         builder.getLayout().getRowSpec(1).getSize(),
                         builder.getLayout().getRowSpec(1).getResizeWeight()));
                 List fields = this.getDefinition().getDefinitions(group);
                 boolean hasFields = false;
                 Iterator it = fields.iterator();
                 while (it.hasNext()) {
                     DynFormFieldDefinition fieldDefinition = (DynFormFieldDefinition) it.next();
                 JPanel fieldsPanel = new JPanel();
                 GridBagLayout gridbag = new GridBagLayout();
                 fieldsPanel.setLayout(gridbag);
                 List<DynFormFieldDefinition> fields = this.getDefinition().getDefinitions(group);
                 int gridy = 0;
                 for (DynFormFieldDefinition fieldDefinition : fields) {
                     if (fieldDefinition.isHidden()) {
                         continue;
+                    }
-...
                     if (this.isReadOnly()) {
                         jfield.setReadOnly(this.isReadOnly());
+                    }
                     hasFields = true;
                     Tags tags = jfield.getDefinition().getTags();
                     if( tags!=null ) {
                         String sep = tags.getString(TAG_DYNFORM_SEPARATOR, null);
                         if( !StringUtils.isBlank(sep) ) {
                             builder.appendSeparator(i18n.getTranslation(sep));
                     List<Action> customActions = getCustomActionsForDataType(fieldDefinition.getDataType());
                     if (customActions != null && !customActions.isEmpty()) {
                         for (Action customAction : customActions) {
                             if (customAction != null) {
                                 jfield.addActionToPopupMenu((String) customAction.getValue(Action.NAME), customAction);
                             } else {
                                 jfield.addSeparatorToPopupMenu();
+                            }
+                        }
+                    }
                     String sep = jfield.getSeparatorTitleToUseBefore();
                     if( !StringUtils.isBlank(sep) ) {
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 2;
                         c.gridheight = 1;
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 1;
                         c.weighty = 0;
                         fieldsPanel.add(toolsSwingManager.createTitledSeparator(sep), c);
                         gridy++;
+                    }
                     double resizeWeight = jfield.getResizeWeight();
                     if( resizeWeight>0 ) {
                         builder.appendRow(new RowSpec(
                             RowSpec.FILL,
                             builder.getLayout().getRowSpec(1).getSize(),
                             resizeWeight)
                         );
                         builder.append(jfield.getJLabel());
                         builder.add(
                                 jfield.asJComponent(),
                                 new CellConstraints(
                                     builder.getColumn(),
                                     builder.getRow(),
                                     CellConstraints.FILL,
                                     CellConstraints.FILL
+                                )
                         );
                         builder.nextColumn();
                     if( jfield.useEmptyLabel() ) {
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 2;
                         c.gridheight = 1;
                     } else {
                         builder.append(jfield.getJLabel(), jfield.asJComponent());
                         c.gridx = 0;
                         c.gridy = gridy;
                         c.gridwidth = 1;
                         c.gridheight = 1;
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 0;
                         c.weighty = 0;
                         jfield.getJLabel().setAlignmentY(Component.TOP_ALIGNMENT);
                         fieldsPanel.add(jfield.getJLabel(), c);
                         c.gridx = 1;
                         c.gridy = gridy;
                         c.gridwidth = 1;
                         c.gridheight = 1;
+                    }
                     double weighty = jfield.getResizeWeight();
                     if( weighty>0 ) {
                         c.fill = GridBagConstraints.BOTH;
                         c.weightx = 1;
                         c.weighty = weighty;
                         fieldsPanel.add(jfield.asJComponent(), c);
                     } else {
                         c.fill = GridBagConstraints.HORIZONTAL;
                         c.weightx = 1;
                         c.weighty = 0;
                         fieldsPanel.add(jfield.asJComponent(), c);
+                    }
                     this.components.put(jfield.getName(), jfield);
                     gridy++;
+                }
                 if( hasFields ) {
                 if( gridy>0 ) {
                     String tablabel = group;
                     if (StringUtils.isEmpty(tablabel)) {
                         tablabel = ToolsLocator.getI18nManager().getTranslation("General");
+                    }
                     tablabel = i18n.getTranslation(tablabel);
                     tabbedPane.addTab(tablabel, builder.getPanel());
                     // Con esto forzamos a alinear los componentes arriba.
                     c.gridx = 0;
                     c.gridy = gridy;
                     c.gridwidth = 1;
                     c.gridheight = 1;
                     c.fill = GridBagConstraints.VERTICAL;
                     c.weightx = 0;
                     c.weighty = 0.001;
                     fieldsPanel.add(new JLabel(), c);
                     tabbedPane.addTab(tablabel,fieldsPanel);
+                }
+            }

     	public JComponent getJLabel();
             public boolean useEmptyLabel();
             public String getSeparatorTitleToUseBefore();
     	public boolean hasValidValue();
     	public void setValue(Object value);

Also available in: Unified diff

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

Revision 2035