Revision 44873

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featurequery/DefaultFeatureQueryGroupByPanel.java
4 4
import java.awt.Component;
5 5
import java.awt.Dimension;
6 6
import java.awt.event.ActionEvent;
7
import java.awt.event.ActionListener;
8 7
import java.net.URL;
8
import java.util.ArrayList;
9
import java.util.Collections;
10
import java.util.List;
9 11
import javax.swing.DefaultComboBoxModel;
10 12
import javax.swing.ImageIcon;
11 13
import javax.swing.JComponent;
12 14
import javax.swing.JLabel;
13 15
import javax.swing.JList;
14 16
import javax.swing.event.ChangeEvent;
15
import javax.swing.event.ChangeListener;
16
import javax.swing.event.ListDataEvent;
17
import javax.swing.event.ListDataListener;
18 17
import javax.swing.event.ListSelectionEvent;
19
import javax.swing.event.ListSelectionListener;
20 18
import org.apache.commons.io.FilenameUtils;
21 19
import org.apache.commons.lang3.StringUtils;
22 20
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
......
112 110
  private void initComponents() {
113 111
    ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
114 112
    
113
    toolsSwingManager.translate(this.btnAttributesFilter);
114
    toolsSwingManager.translate(this.tabGroup);
115
    
115 116
    this.groupByPanel = new DefaultFeatureAttributesSelectionPanel();
116 117

  
117 118
    this.pnlGroupByAttributes.setLayout(new BorderLayout());
......
125 126
            doSelectAttribute();
126 127
    });
127 128
    
128
    this.cboAggretateFunctions.addActionListener(new ActionListener() {
129
        @Override
130
        public void actionPerformed(ActionEvent e) {
131
            doSelectAttribute();
132
        }
129
    this.cboAggretateFunctions.addActionListener((ActionEvent e) -> {
130
      doSelectAttribute();
133 131
    });
134 132

  
135 133
    this.aggregateFunctionsController = toolsSwingManager.createFilteredListController(
......
137 135
            txtAttributesFilter,
138 136
            btnAttributesFilter
139 137
    );
140
    this.aggregateFunctionsController.addChangeListener(new ChangeListener() {
141
        @Override
142
        public void stateChanged(ChangeEvent ce) {
143
            doSelectAttribute();
144
        }
138
    this.aggregateFunctionsController.addChangeListener((ChangeEvent ce) -> {
139
      doSelectAttribute();
145 140
    });
146 141
    Dimension sz = this.getPreferredSize();
147 142
    if (sz.width < DEFAULT_WIDTH) {
......
181 176
  private void updateControls() {
182 177
    int indexAttributes = this.lstAttributes.getSelectedIndex();
183 178
    if( this.cboAggretateFunctions.getModel().getSize() < 1 ) {
184
      DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
185
      model.addElement("<NULL>");
179
      List<String> aggregateFunctions = new ArrayList<>();
186 180
      java.util.function.Function<String, Integer> isAllowed = ((FeatureStoreProviderFactory)(store.getProviderFactory())).allowFunction();
187 181
      ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();    
188 182
      for (SymbolTableFactory factory : manager.getSymbolTableFactories()) {
......
190 184
          SymbolTable symbolTable = factory.create();
191 185
          for (Function function : symbolTable) {
192 186
            if( isAllowed.apply(function.name())!=DataType.NO ) {
193
              model.addElement(function.name());
187
              aggregateFunctions.add(function.name());
194 188
            }
195 189
          }
196 190
          break;
197 191
        }
198 192
      }
193
      Collections.sort(aggregateFunctions);
194
      DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
195
      model.addElement("<NULL>");
196
      for (String functionName : aggregateFunctions) {
197
        model.addElement(functionName);
198
      }
199
      
199 200
      this.cboAggretateFunctions.setModel(model);
200 201
      this.cboAggretateFunctions.setSelectedIndex(0);
201 202
      this.txtCurrentAttributeName.setText("");
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featurequery/DefaultFeatureQueryOrderPanel.java
68 68
  private void initComponents() {
69 69
    ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
70 70

  
71
    toolsSwingManager.translate(this.btnColumnAdd);
72
    toolsSwingManager.translate(this.btnColumnDown);
73
    toolsSwingManager.translate(this.btnColumnRemove);
74
    toolsSwingManager.translate(this.btnColumnSortAscending);
75
    toolsSwingManager.translate(this.btnColumnSortDescending);
76
    toolsSwingManager.translate(this.btnColumnUp);
77
    toolsSwingManager.translate(this.btnColumnsFilter);
78
    
71 79
    ListCellRenderer renderer = DALSwingLocator.getDataSwingManager().createDefaultFeatureAttributeListCellRenderer();
72 80
    this.lstAvailableColumns.setCellRenderer(renderer);
73 81
    this.lstOrderColumns.setCellRenderer(renderer);
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featurequery/DefaultFeatureQueryCalculatedColumnsPanelView.xml
76 76
            <at name="scrollableTracksViewportHeight">true</at>
77 77
            <at name="scrollableTracksViewportWidth">true</at>
78 78
            <at name="name">lstAttributes</at>
79
            <at name="width">346</at>
79
            <at name="width">360</at>
80 80
            <at name="items">
81 81
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
82 82
              <at name="name">items</at>
......
134 134
         </at>
135 135
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
136 136
        </super>
137
        <at name="id">embedded.602911174</at>
137
        <at name="id">embedded.1663873132</at>
138 138
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
139 139
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
140 140
        <at name="components">
......
510 510
         </at>
511 511
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
512 512
        </super>
513
        <at name="id">embedded.184868458</at>
513
        <at name="id">embedded.699355138</at>
514 514
        <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:4DLU:NONE,CENTER:DEFAULT:NONE</at>
515
        <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
515
        <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
516 516
        <at name="components">
517 517
         <object classname="java.util.LinkedList">
518 518
          <item >
......
701 701
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
702 702
              <at name="cellconstraints">
703 703
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
704
                <at name="column">5</at>
705
                <at name="row">11</at>
706
                <at name="colspan">1</at>
707
                <at name="rowspan">1</at>
708
                <at name="halign">default</at>
709
                <at name="valign">top</at>
710
                <at name="insets" object="insets">0,0,0,0</at>
711
               </object>
712
              </at>
713
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
714
             </super>
715
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
716
             <at name="beanclass">javax.swing.JButton</at>
717
             <at name="beanproperties">
718
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
719
               <at name="classname">javax.swing.JButton</at>
720
               <at name="properties">
721
                <object classname="com.jeta.forms.store.support.PropertyMap">
722
                 <at name="border">
723
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
724
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
725
                    <at name="name">border</at>
726
                   </super>
727
                   <at name="borders">
728
                    <object classname="java.util.LinkedList">
729
                     <item >
730
                      <at name="value">
731
                       <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
732
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
733
                         <at name="name">border</at>
734
                        </super>
735
                        <at name="top">2</at>
736
                        <at name="left">2</at>
737
                        <at name="bottom">2</at>
738
                        <at name="right">2</at>
739
                       </object>
740
                      </at>
741
                     </item>
742
                    </object>
743
                   </at>
744
                  </object>
745
                 </at>
746
                 <at name="actionCommand">...</at>
747
                 <at name="name">btnColumnExpression</at>
748
                 <at name="width">16</at>
749
                 <at name="text">...</at>
750
                 <at name="height">18</at>
751
                </object>
752
               </at>
753
              </object>
754
             </at>
755
            </object>
756
           </at>
757
          </item>
758
          <item >
759
           <at name="value">
760
            <object classname="com.jeta.forms.store.memento.BeanMemento">
761
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
762
              <at name="cellconstraints">
763
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
764
                <at name="column">7</at>
765
                <at name="row">11</at>
766
                <at name="colspan">1</at>
767
                <at name="rowspan">1</at>
768
                <at name="halign">default</at>
769
                <at name="valign">top</at>
770
                <at name="insets" object="insets">0,0,0,0</at>
771
               </object>
772
              </at>
773
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
774
             </super>
775
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
776
             <at name="beanclass">javax.swing.JButton</at>
777
             <at name="beanproperties">
778
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
779
               <at name="classname">javax.swing.JButton</at>
780
               <at name="properties">
781
                <object classname="com.jeta.forms.store.support.PropertyMap">
782
                 <at name="border">
783
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
784
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
785
                    <at name="name">border</at>
786
                   </super>
787
                   <at name="borders">
788
                    <object classname="java.util.LinkedList">
789
                     <item >
790
                      <at name="value">
791
                       <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
792
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
793
                         <at name="name">border</at>
794
                        </super>
795
                        <at name="top">2</at>
796
                        <at name="left">2</at>
797
                        <at name="bottom">2</at>
798
                        <at name="right">2</at>
799
                       </object>
800
                      </at>
801
                     </item>
802
                    </object>
803
                   </at>
804
                  </object>
805
                 </at>
806
                 <at name="actionCommand">...</at>
807
                 <at name="name">btnColumnExpressionHistory</at>
808
                 <at name="width">16</at>
809
                 <at name="text">...</at>
810
                 <at name="height">18</at>
811
                </object>
812
               </at>
813
              </object>
814
             </at>
815
            </object>
816
           </at>
817
          </item>
818
          <item >
819
           <at name="value">
820
            <object classname="com.jeta.forms.store.memento.BeanMemento">
821
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
822
              <at name="cellconstraints">
823
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
824
                <at name="column">9</at>
825
                <at name="row">11</at>
826
                <at name="colspan">1</at>
827
                <at name="rowspan">1</at>
828
                <at name="halign">default</at>
829
                <at name="valign">top</at>
830
                <at name="insets" object="insets">0,0,0,0</at>
831
               </object>
832
              </at>
833
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
834
             </super>
835
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
836
             <at name="beanclass">javax.swing.JButton</at>
837
             <at name="beanproperties">
838
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
839
               <at name="classname">javax.swing.JButton</at>
840
               <at name="properties">
841
                <object classname="com.jeta.forms.store.support.PropertyMap">
842
                 <at name="border">
843
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
844
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
845
                    <at name="name">border</at>
846
                   </super>
847
                   <at name="borders">
848
                    <object classname="java.util.LinkedList">
849
                     <item >
850
                      <at name="value">
851
                       <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
852
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
853
                         <at name="name">border</at>
854
                        </super>
855
                        <at name="top">2</at>
856
                        <at name="left">2</at>
857
                        <at name="bottom">2</at>
858
                        <at name="right">2</at>
859
                       </object>
860
                      </at>
861
                     </item>
862
                    </object>
863
                   </at>
864
                  </object>
865
                 </at>
866
                 <at name="actionCommand">...</at>
867
                 <at name="name">btnColumnExpressionBookmarks</at>
868
                 <at name="width">20</at>
869
                 <at name="text">...</at>
870
                 <at name="height">18</at>
871
                </object>
872
               </at>
873
              </object>
874
             </at>
875
            </object>
876
           </at>
877
          </item>
878
          <item >
879
           <at name="value">
880
            <object classname="com.jeta.forms.store.memento.BeanMemento">
881
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
882
              <at name="cellconstraints">
883
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
884 704
                <at name="column">3</at>
885 705
                <at name="row">1</at>
886
                <at name="colspan">7</at>
706
                <at name="colspan">3</at>
887 707
                <at name="rowspan">1</at>
888 708
                <at name="halign">default</at>
889 709
                <at name="valign">default</at>
......
920 740
                  </object>
921 741
                 </at>
922 742
                 <at name="name">txtColumnName</at>
923
                 <at name="width">476</at>
743
                 <at name="width">462</at>
924 744
                 <at name="height">20</at>
925 745
                </object>
926 746
               </at>
......
935 755
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
936 756
              <at name="cellconstraints">
937 757
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
938
                <at name="column">9</at>
758
                <at name="column">5</at>
939 759
                <at name="row">3</at>
940 760
                <at name="colspan">1</at>
941 761
                <at name="rowspan">1</at>
......
988 808
                  </object>
989 809
                 </at>
990 810
                 <at name="name">btnColumnDataType</at>
991
                 <at name="width">20</at>
811
                 <at name="width">40</at>
992 812
                 <at name="height">20</at>
993 813
                </object>
994 814
               </at>
......
1005 825
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1006 826
                <at name="column">3</at>
1007 827
                <at name="row">3</at>
1008
                <at name="colspan">5</at>
828
                <at name="colspan">2</at>
1009 829
                <at name="rowspan">1</at>
1010 830
                <at name="halign">default</at>
1011 831
                <at name="valign">default</at>
......
1042 862
                  </object>
1043 863
                 </at>
1044 864
                 <at name="name">cboColumnDataType</at>
1045
                 <at name="width">445</at>
865
                 <at name="width">418</at>
1046 866
                 <at name="items">
1047 867
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
1048 868
                   <at name="name">items</at>
......
1064 884
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1065 885
                <at name="column">1</at>
1066 886
                <at name="row">13</at>
1067
                <at name="colspan">9</at>
887
                <at name="colspan">5</at>
1068 888
                <at name="rowspan">1</at>
1069 889
                <at name="halign">default</at>
1070 890
                <at name="valign">default</at>
......
1073 893
              </at>
1074 894
              <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1075 895
             </super>
1076
             <at name="id">embedded.467892967</at>
896
             <at name="id">embedded.1170552575</at>
1077 897
             <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1078 898
             <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1079 899
             <at name="components">
......
1345 1165
                 <at name="scrollableTracksViewportHeight">true</at>
1346 1166
                 <at name="scrollableTracksViewportWidth">true</at>
1347 1167
                 <at name="name">txtColumnExpression</at>
1348
                 <at name="width">389</at>
1168
                 <at name="width">409</at>
1349 1169
                 <at name="scollBars">
1350 1170
                  <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1351 1171
                   <at name="name">scollBars</at>
......
1389 1209
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1390 1210
                <at name="column">3</at>
1391 1211
                <at name="row">5</at>
1392
                <at name="colspan">7</at>
1212
                <at name="colspan">3</at>
1393 1213
                <at name="rowspan">1</at>
1394 1214
                <at name="halign">default</at>
1395 1215
                <at name="valign">default</at>
......
1426 1246
                  </object>
1427 1247
                 </at>
1428 1248
                 <at name="name">txtColumnSize</at>
1429
                 <at name="width">476</at>
1249
                 <at name="width">462</at>
1430 1250
                 <at name="height">20</at>
1431 1251
                </object>
1432 1252
               </at>
......
1563 1383
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1564 1384
                <at name="column">3</at>
1565 1385
                <at name="row">7</at>
1566
                <at name="colspan">7</at>
1386
                <at name="colspan">3</at>
1567 1387
                <at name="rowspan">1</at>
1568 1388
                <at name="halign">default</at>
1569 1389
                <at name="valign">default</at>
......
1600 1420
                  </object>
1601 1421
                 </at>
1602 1422
                 <at name="name">txtColumnPrecision</at>
1603
                 <at name="width">476</at>
1423
                 <at name="width">462</at>
1604 1424
                 <at name="height">20</at>
1605 1425
                </object>
1606 1426
               </at>
......
1677 1497
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1678 1498
                <at name="column">3</at>
1679 1499
                <at name="row">9</at>
1680
                <at name="colspan">7</at>
1500
                <at name="colspan">3</at>
1681 1501
                <at name="rowspan">1</at>
1682 1502
                <at name="halign">default</at>
1683 1503
                <at name="valign">default</at>
......
1714 1534
                  </object>
1715 1535
                 </at>
1716 1536
                 <at name="name">txtColumnScale</at>
1717
                 <at name="width">476</at>
1537
                 <at name="width">462</at>
1718 1538
                 <at name="height">20</at>
1719 1539
                </object>
1720 1540
               </at>
......
1723 1543
            </object>
1724 1544
           </at>
1725 1545
          </item>
1546
          <item >
1547
           <at name="value">
1548
            <object classname="com.jeta.forms.store.memento.FormMemento">
1549
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
1550
              <at name="cellconstraints">
1551
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1552
                <at name="column">5</at>
1553
                <at name="row">11</at>
1554
                <at name="colspan">1</at>
1555
                <at name="rowspan">1</at>
1556
                <at name="halign">default</at>
1557
                <at name="valign">default</at>
1558
                <at name="insets" object="insets">0,0,0,0</at>
1559
               </object>
1560
              </at>
1561
              <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1562
             </super>
1563
             <at name="id">embedded.Wed10f7cE17155d4bf69EV7fff</at>
1564
             <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)</at>
1565
             <at name="colspecs">FILL:DEFAULT:NONE</at>
1566
             <at name="components">
1567
              <object classname="java.util.LinkedList">
1568
               <item >
1569
                <at name="value">
1570
                 <object classname="com.jeta.forms.store.memento.BeanMemento">
1571
                  <super classname="com.jeta.forms.store.memento.ComponentMemento">
1572
                   <at name="cellconstraints">
1573
                    <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1574
                     <at name="column">1</at>
1575
                     <at name="row">1</at>
1576
                     <at name="colspan">1</at>
1577
                     <at name="rowspan">1</at>
1578
                     <at name="halign">default</at>
1579
                     <at name="valign">default</at>
1580
                     <at name="insets" object="insets">0,0,0,0</at>
1581
                    </object>
1582
                   </at>
1583
                   <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1584
                  </super>
1585
                  <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1586
                  <at name="beanclass">javax.swing.JButton</at>
1587
                  <at name="beanproperties">
1588
                   <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1589
                    <at name="classname">javax.swing.JButton</at>
1590
                    <at name="properties">
1591
                     <object classname="com.jeta.forms.store.support.PropertyMap">
1592
                      <at name="border">
1593
                       <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1594
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1595
                         <at name="name">border</at>
1596
                        </super>
1597
                        <at name="borders">
1598
                         <object classname="java.util.LinkedList">
1599
                          <item >
1600
                           <at name="value">
1601
                            <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1602
                             <super classname="com.jeta.forms.store.properties.BorderProperty">
1603
                              <at name="name">border</at>
1604
                             </super>
1605
                             <at name="top">2</at>
1606
                             <at name="left">2</at>
1607
                             <at name="bottom">2</at>
1608
                             <at name="right">2</at>
1609
                            </object>
1610
                           </at>
1611
                          </item>
1612
                         </object>
1613
                        </at>
1614
                       </object>
1615
                      </at>
1616
                      <at name="actionCommand">...</at>
1617
                      <at name="name">btnColumnExpression</at>
1618
                      <at name="width">16</at>
1619
                      <at name="text">...</at>
1620
                      <at name="height">18</at>
1621
                     </object>
1622
                    </at>
1623
                   </object>
1624
                  </at>
1625
                 </object>
1626
                </at>
1627
               </item>
1628
               <item >
1629
                <at name="value">
1630
                 <object classname="com.jeta.forms.store.memento.BeanMemento">
1631
                  <super classname="com.jeta.forms.store.memento.ComponentMemento">
1632
                   <at name="cellconstraints">
1633
                    <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1634
                     <at name="column">1</at>
1635
                     <at name="row">3</at>
1636
                     <at name="colspan">1</at>
1637
                     <at name="rowspan">1</at>
1638
                     <at name="halign">default</at>
1639
                     <at name="valign">default</at>
1640
                     <at name="insets" object="insets">0,0,0,0</at>
1641
                    </object>
1642
                   </at>
1643
                   <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1644
                  </super>
1645
                  <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1646
                  <at name="beanclass">javax.swing.JButton</at>
1647
                  <at name="beanproperties">
1648
                   <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1649
                    <at name="classname">javax.swing.JButton</at>
1650
                    <at name="properties">
1651
                     <object classname="com.jeta.forms.store.support.PropertyMap">
1652
                      <at name="border">
1653
                       <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1654
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1655
                         <at name="name">border</at>
1656
                        </super>
1657
                        <at name="borders">
1658
                         <object classname="java.util.LinkedList">
1659
                          <item >
1660
                           <at name="value">
1661
                            <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1662
                             <super classname="com.jeta.forms.store.properties.BorderProperty">
1663
                              <at name="name">border</at>
1664
                             </super>
1665
                             <at name="top">2</at>
1666
                             <at name="left">2</at>
1667
                             <at name="bottom">2</at>
1668
                             <at name="right">2</at>
1669
                            </object>
1670
                           </at>
1671
                          </item>
1672
                         </object>
1673
                        </at>
1674
                       </object>
1675
                      </at>
1676
                      <at name="actionCommand">...</at>
1677
                      <at name="name">btnColumnExpressionHistory</at>
1678
                      <at name="width">16</at>
1679
                      <at name="text">...</at>
1680
                      <at name="height">18</at>
1681
                     </object>
1682
                    </at>
1683
                   </object>
1684
                  </at>
1685
                 </object>
1686
                </at>
1687
               </item>
1688
               <item >
1689
                <at name="value">
1690
                 <object classname="com.jeta.forms.store.memento.BeanMemento">
1691
                  <super classname="com.jeta.forms.store.memento.ComponentMemento">
1692
                   <at name="cellconstraints">
1693
                    <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1694
                     <at name="column">1</at>
1695
                     <at name="row">5</at>
1696
                     <at name="colspan">1</at>
1697
                     <at name="rowspan">1</at>
1698
                     <at name="halign">default</at>
1699
                     <at name="valign">default</at>
1700
                     <at name="insets" object="insets">0,0,0,0</at>
1701
                    </object>
1702
                   </at>
1703
                   <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1704
                  </super>
1705
                  <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1706
                  <at name="beanclass">javax.swing.JButton</at>
1707
                  <at name="beanproperties">
1708
                   <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1709
                    <at name="classname">javax.swing.JButton</at>
1710
                    <at name="properties">
1711
                     <object classname="com.jeta.forms.store.support.PropertyMap">
1712
                      <at name="border">
1713
                       <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1714
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1715
                         <at name="name">border</at>
1716
                        </super>
1717
                        <at name="borders">
1718
                         <object classname="java.util.LinkedList">
1719
                          <item >
1720
                           <at name="value">
1721
                            <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1722
                             <super classname="com.jeta.forms.store.properties.BorderProperty">
1723
                              <at name="name">border</at>
1724
                             </super>
1725
                             <at name="top">2</at>
1726
                             <at name="left">2</at>
1727
                             <at name="bottom">2</at>
1728
                             <at name="right">2</at>
1729
                            </object>
1730
                           </at>
1731
                          </item>
1732
                         </object>
1733
                        </at>
1734
                       </object>
1735
                      </at>
1736
                      <at name="actionCommand">...</at>
1737
                      <at name="name">btnColumnExpressionBookmarks</at>
1738
                      <at name="width">16</at>
1739
                      <at name="text">...</at>
1740
                      <at name="height">18</at>
1741
                     </object>
1742
                    </at>
1743
                   </object>
1744
                  </at>
1745
                 </object>
1746
                </at>
1747
               </item>
1748
              </object>
1749
             </at>
1750
             <at name="properties">
1751
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1752
               <at name="classname">com.jeta.forms.gui.form.GridView</at>
1753
               <at name="properties">
1754
                <object classname="com.jeta.forms.store.support.PropertyMap">
1755
                 <at name="border">
1756
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1757
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1758
                    <at name="name">border</at>
1759
                   </super>
1760
                   <at name="borders">
1761
                    <object classname="java.util.LinkedList"/>
1762
                   </at>
1763
                  </object>
1764
                 </at>
1765
                 <at name="name"></at>
1766
                 <at name="fill">
1767
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1768
                   <at name="name">fill</at>
1769
                  </object>
1770
                 </at>
1771
                 <at name="scollBars">
1772
                  <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1773
                   <at name="name">scollBars</at>
1774
                   <at name="verticalpolicy">21</at>
1775
                   <at name="horizontalpolicy">31</at>
1776
                  </object>
1777
                 </at>
1778
                </object>
1779
               </at>
1780
              </object>
1781
             </at>
1782
             <at name="cellpainters">
1783
              <object classname="com.jeta.forms.store.support.Matrix">
1784
               <at name="rows">
1785
                <object classname="[Ljava.lang.Object;" size="6">
1786
                 <at name="item" index="0">
1787
                  <object classname="[Ljava.lang.Object;" size="1"/>
1788
                 </at>
1789
                 <at name="item" index="1">
1790
                  <object classname="[Ljava.lang.Object;" size="1"/>
1791
                 </at>
1792
                 <at name="item" index="2">
1793
                  <object classname="[Ljava.lang.Object;" size="1"/>
1794
                 </at>
1795
                 <at name="item" index="3">
1796
                  <object classname="[Ljava.lang.Object;" size="1"/>
1797
                 </at>
1798
                 <at name="item" index="4">
1799
                  <object classname="[Ljava.lang.Object;" size="1"/>
1800
                 </at>
1801
                 <at name="item" index="5">
1802
                  <object classname="[Ljava.lang.Object;" size="1"/>
1803
                 </at>
1804
                </object>
1805
               </at>
1806
              </object>
1807
             </at>
1808
             <at name="rowgroups">
1809
              <object classname="com.jeta.forms.store.memento.FormGroupSet">
1810
               <at name="groups">
1811
                <object classname="java.util.HashMap"/>
1812
               </at>
1813
              </object>
1814
             </at>
1815
             <at name="colgroups">
1816
              <object classname="com.jeta.forms.store.memento.FormGroupSet">
1817
               <at name="groups">
1818
                <object classname="java.util.HashMap"/>
1819
               </at>
1820
              </object>
1821
             </at>
1822
            </object>
1823
           </at>
1824
          </item>
1726 1825
         </object>
1727 1826
        </at>
1728 1827
        <at name="properties">
......
1782 1881
          <at name="rows">
1783 1882
           <object classname="[Ljava.lang.Object;" size="13">
1784 1883
            <at name="item" index="0">
1785
             <object classname="[Ljava.lang.Object;" size="9"/>
1884
             <object classname="[Ljava.lang.Object;" size="5"/>
1786 1885
            </at>
1787 1886
            <at name="item" index="1">
1788
             <object classname="[Ljava.lang.Object;" size="9"/>
1887
             <object classname="[Ljava.lang.Object;" size="5"/>
1789 1888
            </at>
1790 1889
            <at name="item" index="2">
1791
             <object classname="[Ljava.lang.Object;" size="9"/>
1890
             <object classname="[Ljava.lang.Object;" size="5"/>
1792 1891
            </at>
1793 1892
            <at name="item" index="3">
1794
             <object classname="[Ljava.lang.Object;" size="9"/>
1893
             <object classname="[Ljava.lang.Object;" size="5"/>
1795 1894
            </at>
1796 1895
            <at name="item" index="4">
1797
             <object classname="[Ljava.lang.Object;" size="9"/>
1896
             <object classname="[Ljava.lang.Object;" size="5"/>
1798 1897
            </at>
1799 1898
            <at name="item" index="5">
1800
             <object classname="[Ljava.lang.Object;" size="9"/>
1899
             <object classname="[Ljava.lang.Object;" size="5"/>
1801 1900
            </at>
1802 1901
            <at name="item" index="6">
1803
             <object classname="[Ljava.lang.Object;" size="9"/>
1902
             <object classname="[Ljava.lang.Object;" size="5"/>
1804 1903
            </at>
1805 1904
            <at name="item" index="7">
1806
             <object classname="[Ljava.lang.Object;" size="9"/>
1905
             <object classname="[Ljava.lang.Object;" size="5"/>
1807 1906
            </at>
1808 1907
            <at name="item" index="8">
1809
             <object classname="[Ljava.lang.Object;" size="9"/>
1908
             <object classname="[Ljava.lang.Object;" size="5"/>
1810 1909
            </at>
1811 1910
            <at name="item" index="9">
1812
             <object classname="[Ljava.lang.Object;" size="9"/>
1911
             <object classname="[Ljava.lang.Object;" size="5"/>
1813 1912
            </at>
1814 1913
            <at name="item" index="10">
1815
             <object classname="[Ljava.lang.Object;" size="9"/>
1914
             <object classname="[Ljava.lang.Object;" size="5"/>
1816 1915
            </at>
1817 1916
            <at name="item" index="11">
1818
             <object classname="[Ljava.lang.Object;" size="9"/>
1917
             <object classname="[Ljava.lang.Object;" size="5"/>
1819 1918
            </at>
1820 1919
            <at name="item" index="12">
1821
             <object classname="[Ljava.lang.Object;" size="9"/>
1920
             <object classname="[Ljava.lang.Object;" size="5"/>
1822 1921
            </at>
1823 1922
           </object>
1824 1923
          </at>
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featurequery/DefaultFeatureQueryCalculatedColumnsPanelView.java
31 31
   JLabel lblName = new JLabel();
32 32
   JLabel lblType = new JLabel();
33 33
   JLabel lblExpression = new JLabel();
34
   JButton btnColumnExpression = new JButton();
35
   JButton btnColumnExpressionHistory = new JButton();
36
   JButton btnColumnExpressionBookmarks = new JButton();
37 34
   JTextField txtColumnName = new JTextField();
38 35
   JButton btnColumnDataType = new JButton();
39 36
   JComboBox cboColumnDataType = new JComboBox();
......
46 43
   JTextField txtColumnPrecision = new JTextField();
47 44
   JLabel lblScale = new JLabel();
48 45
   JTextField txtColumnScale = new JTextField();
46
   JButton btnColumnExpression = new JButton();
47
   JButton btnColumnExpressionHistory = new JButton();
48
   JButton btnColumnExpressionBookmarks = new JButton();
49 49

  
50 50
   /**
51 51
    * Default constructor
......
196 196
   public JPanel createPanel2()
197 197
   {
198 198
      JPanel jpanel1 = new JPanel();
199
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:4DLU:NONE,CENTER:DEFAULT:NONE");
199
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,CENTER:DEFAULT:NONE,CENTER:4DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:4DLU:NONE,CENTER:DEFAULT:NONE");
200 200
      CellConstraints cc = new CellConstraints();
201 201
      jpanel1.setLayout(formlayout1);
202 202

  
......
212 212
      lblExpression.setText("_Expression");
213 213
      jpanel1.add(lblExpression,new CellConstraints(1,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
214 214

  
215
      btnColumnExpression.setActionCommand("...");
216
      btnColumnExpression.setName("btnColumnExpression");
217
      btnColumnExpression.setText("...");
218
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
219
      btnColumnExpression.setBorder(emptyborder1);
220
      jpanel1.add(btnColumnExpression,new CellConstraints(5,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
221

  
222
      btnColumnExpressionHistory.setActionCommand("...");
223
      btnColumnExpressionHistory.setName("btnColumnExpressionHistory");
224
      btnColumnExpressionHistory.setText("...");
225
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
226
      btnColumnExpressionHistory.setBorder(emptyborder2);
227
      jpanel1.add(btnColumnExpressionHistory,new CellConstraints(7,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
228

  
229
      btnColumnExpressionBookmarks.setActionCommand("...");
230
      btnColumnExpressionBookmarks.setName("btnColumnExpressionBookmarks");
231
      btnColumnExpressionBookmarks.setText("...");
232
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
233
      btnColumnExpressionBookmarks.setBorder(emptyborder3);
234
      jpanel1.add(btnColumnExpressionBookmarks,new CellConstraints(9,11,1,1,CellConstraints.DEFAULT,CellConstraints.TOP));
235

  
236 215
      txtColumnName.setName("txtColumnName");
237
      jpanel1.add(txtColumnName,cc.xywh(3,1,7,1));
216
      jpanel1.add(txtColumnName,cc.xywh(3,1,3,1));
238 217

  
239 218
      btnColumnDataType.setActionCommand("...");
240 219
      btnColumnDataType.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-more.png"));
241 220
      btnColumnDataType.setName("btnColumnDataType");
242
      EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2);
243
      btnColumnDataType.setBorder(emptyborder4);
244
      jpanel1.add(btnColumnDataType,cc.xy(9,3));
221
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
222
      btnColumnDataType.setBorder(emptyborder1);
223
      jpanel1.add(btnColumnDataType,cc.xy(5,3));
245 224

  
246 225
      cboColumnDataType.setName("cboColumnDataType");
247
      jpanel1.add(cboColumnDataType,cc.xywh(3,3,5,1));
226
      jpanel1.add(cboColumnDataType,cc.xywh(3,3,2,1));
248 227

  
249
      jpanel1.add(createPanel3(),cc.xywh(1,13,9,1));
228
      jpanel1.add(createPanel3(),cc.xywh(1,13,5,1));
250 229
      txtColumnExpression.setName("txtColumnExpression");
251 230
      JScrollPane jscrollpane1 = new JScrollPane();
252 231
      jscrollpane1.setViewportView(txtColumnExpression);
......
255 234
      jpanel1.add(jscrollpane1,cc.xy(3,11));
256 235

  
257 236
      txtColumnSize.setName("txtColumnSize");
258
      jpanel1.add(txtColumnSize,cc.xywh(3,5,7,1));
237
      jpanel1.add(txtColumnSize,cc.xywh(3,5,3,1));
259 238

  
260 239
      lblSize.setName("lblSize");
261 240
      lblSize.setText("_Size");
......
266 245
      jpanel1.add(lblPrecision,cc.xy(1,7));
267 246

  
268 247
      txtColumnPrecision.setName("txtColumnPrecision");
269
      jpanel1.add(txtColumnPrecision,cc.xywh(3,7,7,1));
248
      jpanel1.add(txtColumnPrecision,cc.xywh(3,7,3,1));
270 249

  
271 250
      lblScale.setName("lblScale");
272 251
      lblScale.setText("_Scale");
273 252
      jpanel1.add(lblScale,cc.xy(1,9));
274 253

  
275 254
      txtColumnScale.setName("txtColumnScale");
276
      jpanel1.add(txtColumnScale,cc.xywh(3,9,7,1));
255
      jpanel1.add(txtColumnScale,cc.xywh(3,9,3,1));
277 256

  
278
      addFillComponents(jpanel1,new int[]{ 2,4,5,6,7,8,9 },new int[]{ 2,4,6,8,10,12,13 });
257
      jpanel1.add(createPanel4(),cc.xy(5,11));
258
      addFillComponents(jpanel1,new int[]{ 2,4,5 },new int[]{ 2,4,6,8,10,12,13 });
279 259
      return jpanel1;
280 260
   }
281 261

  
......
306 286
      return jpanel1;
307 287
   }
308 288

  
289
   public JPanel createPanel4()
290
   {
291
      JPanel jpanel1 = new JPanel();
292
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)");
293
      CellConstraints cc = new CellConstraints();
294
      jpanel1.setLayout(formlayout1);
295

  
296
      btnColumnExpression.setActionCommand("...");
297
      btnColumnExpression.setName("btnColumnExpression");
298
      btnColumnExpression.setText("...");
299
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
300
      btnColumnExpression.setBorder(emptyborder1);
301
      jpanel1.add(btnColumnExpression,cc.xy(1,1));
302

  
303
      btnColumnExpressionHistory.setActionCommand("...");
304
      btnColumnExpressionHistory.setName("btnColumnExpressionHistory");
305
      btnColumnExpressionHistory.setText("...");
306
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
307
      btnColumnExpressionHistory.setBorder(emptyborder2);
308
      jpanel1.add(btnColumnExpressionHistory,cc.xy(1,3));
309

  
310
      btnColumnExpressionBookmarks.setActionCommand("...");
311
      btnColumnExpressionBookmarks.setName("btnColumnExpressionBookmarks");
312
      btnColumnExpressionBookmarks.setText("...");
313
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
314
      btnColumnExpressionBookmarks.setBorder(emptyborder3);
315
      jpanel1.add(btnColumnExpressionBookmarks,cc.xy(1,5));
316

  
317
      addFillComponents(jpanel1,new int[0],new int[]{ 2,4,6 });
318
      return jpanel1;
319
   }
320

  
309 321
   /**
310 322
    * Initializer
311 323
    */
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1377 1377
_You_must_use_double_quotes_to_use_a_field_that_is_not_a_valid_identifier_When_the_name_does_not_start_with_a_letter_or_contains_characters_that_are_not_letters_numbers_or_underscore=You must use double quotes to use a field that is not a valid identifier.\nWhen the name does not start with a letter or\ncontains characters that are not letters, numbers or underscore.
1378 1378
_Perhaps_you_wanted_to_use_a_similar_field=Perhaps you wanted to use a similar field.
1379 1379
_The_indicated_field_does_not_exist_in_the_table=The indicated field does not exist in the table.
1380
_Aggregate_functions=Aggregate functions
1381
_Select_group_columns_and_aggregate_functions=Select group columns and aggregate functions
1382
_Select_order=Select order
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1456 1456
_You_can_access_the_fields_in_a_table_by_prefixing_the_table_name_followed_by_a_period_For_example_TABLE_FIELD_This_is_necessary_whenever_the_name_of_the_field_and_the_table_match=Puede acceder a los campos de una tabla anteponiendole el nombre de la tabla seguido de un punto.\nPor ejemplo <i>TABLA.CAMPO</i>.\nEsto es necesarios siempre que el nombre del campo y la tabla coincidan.
1457 1457
_You_must_use_double_quotes_to_use_a_field_that_is_not_a_valid_identifier_When_the_name_does_not_start_with_a_letter_or_contains_characters_that_are_not_letters_numbers_or_underscore=Debe usar comillas dobles para usar un campo que no sea un identificador valido.\nCuando el nombre no comience por letra o\nque contenga caracteres que no sean letras, numeros o guion bajo.
1458 1458
_Perhaps_you_wanted_to_use_a_similar_field=Quiz\u00e1s quiso usar un campo parecido.
1459
 _The_indicated_field_does_not_exist_in_the_table=El campo indicado no existe en la tabla.
1459
_The_indicated_field_does_not_exist_in_the_table=El campo indicado no existe en la tabla.
1460
_Aggregate_functions=Funciones de agregado
1461
_Select_group_columns_and_aggregate_functions=Seleccione columnas de agrupamiento y funciones de agregado
1462
_Select_order=Seleccione ordenaci\u00f3n

Also available in: Unified diff