/ - Diff - | gvSIG desktop 1 - gvSIG

         private List<String> visibleColumnNames;
         private List<String> visibleColumnNamesOriginal;
         private Map<String, String> name2Alias;
         private Map<String, String> name2AliasOriginal;
         /**
          * @see FeatureTableModel#FeatureTableModel(FeatureStore, FeatureQuery)
          */
-...
                 if (!visibleColumnNames.contains(colName) && newColumns.contains(colName)) {
                     // Add new columns
                     visibleColumnNames.add(colName);
                     visibleColumnNamesOriginal.add(colName);
+                }
+            }
             // remove from visible columns removed columns
             visibleColumnNames.retainAll(columnNames);
             visibleColumnNamesOriginal.retainAll(columnNames);
             // remove from alias map removed columns
             name2Alias.keySet().retainAll(visibleColumnNames);
             name2Alias.keySet().retainAll(columnNames);
             name2AliasOriginal.keySet().retainAll(columnNames);
             super.setFeatureType(featureType);
-...
         private void initializeAliases() {
             int columns = super.getColumnCount();
             name2Alias = new HashMap<String, String>(columns);
             name2AliasOriginal = new HashMap<String, String>(columns);
             //
             // for (int i = 0; i < columns; i++) {
             // String columnName = super.getColumnName(i);
-...
                     visibleColumnNames.add(columnName);
+                }
+            }
             visibleColumnNamesOriginal = new ArrayList<String>(visibleColumnNames);
+        }
         /**
-...
             int realColumnIndex = getOriginalColumnIndex(columnIndex);
             return super.setFeatureValue(feature, realColumnIndex, value);
+        }
         /**
          * Make current changes in configuration (visible columns and aliases)
          * as definitive.
          */
         public void acceptChanges() {
         	visibleColumnNamesOriginal = new ArrayList<String>(visibleColumnNames);
         	name2AliasOriginal = new HashMap<String, String>(name2Alias);
+        }
         /**
          * Cancel current changes in configuration (visible columns and aliases)
          * and return to previous status.
          */
         public void cancelChanges() {
         	visibleColumnNames = new ArrayList<String>(visibleColumnNamesOriginal);
         	name2Alias = new HashMap<String, String>(name2AliasOriginal);
         	fireTableStructureChanged();
+        }
+    }

             setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
             add(scrollPane);
+        }
         /**
          * Make current changes in configuration (visible columns and aliases)
          * as definitive.
          */
         public void accept() {
         	tableModel.acceptChanges();
+        }
         /**
          * Cancel current changes in configuration (visible columns and aliases)
          * and return to previous status.
          */
         public void cancel() {
         	tableModel.cancelChanges();
+        }
+    }

     	public static int getVisibilityColumn() {
     		return VISIBILITY_COLUMN;
+    	}
         /**
          * Make current changes in configuration (visible columns and aliases)
          * as definitive.
          */
     	public void acceptChanges() {
     		configurable.acceptChanges();
+    	}
         /**
          * Cancel current changes in configuration (visible columns and aliases)
          * and return to previous status.
          */
     	public void cancelChanges() {
     		configurable.cancelChanges();
+    	}
+    }

| gvSIG desktop 1

Revision 38409