Revision 47426
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultJExpressionBuilderView.java | ||
---|---|---|
318 | 318 |
jpanel1.add(txtGroupElement,cc.xy(1,1)); |
319 | 319 |
|
320 | 320 |
btnGroupElementInsert.setActionCommand("+"); |
321 |
btnGroupElementInsert.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-insert-text.png"));
|
|
321 |
btnGroupElementInsert.setIcon(loadImage("common-add.png"));
|
|
322 | 322 |
btnGroupElementInsert.setName("btnGroupElementInsert"); |
323 | 323 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
324 | 324 |
btnGroupElementInsert.setBorder(emptyborder1); |
... | ... | |
336 | 336 |
jpanel1.setLayout(formlayout1); |
337 | 337 |
|
338 | 338 |
btnSimpleElementInsert.setActionCommand("+"); |
339 |
btnSimpleElementInsert.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-insert-text.png"));
|
|
339 |
btnSimpleElementInsert.setIcon(loadImage("common-add.png"));
|
|
340 | 340 |
btnSimpleElementInsert.setName("btnSimpleElementInsert"); |
341 | 341 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
342 | 342 |
btnSimpleElementInsert.setBorder(emptyborder1); |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/ExpressionEvaluatorSwingLibraryImpl.java | ||
---|---|---|
1 | 1 |
package org.gvsig.expressionevaluator.swing.impl; |
2 | 2 |
|
3 |
import java.net.URL; |
|
4 | 3 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLibrary; |
5 | 4 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLibrary; |
6 | 5 |
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator; |
... | ... | |
10 | 9 |
import org.gvsig.tools.dynform.spi.DynFormSPIManager; |
11 | 10 |
import org.gvsig.tools.library.AbstractLibrary; |
12 | 11 |
import org.gvsig.tools.library.LibraryException; |
13 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
|
14 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
|
12 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
|
15 | 13 |
|
16 | 14 |
public class ExpressionEvaluatorSwingLibraryImpl extends AbstractLibrary { |
17 | 15 |
|
... | ... | |
29 | 27 |
|
30 | 28 |
@Override |
31 | 29 |
protected void doPostInitialize() throws LibraryException { |
32 |
String[][] iconNames = new String[][] { |
|
33 |
new String[] { "picker", "picker-expression" }, |
|
34 |
new String[] { "element", "expressionbuilder-element-constant" }, |
|
35 |
new String[] { "element", "expressionbuilder-element-function" }, |
|
36 |
new String[] { "element", "expressionbuilder-element-function-sql" }, |
|
37 |
new String[] { "element", "expressionbuilder-element-group" }, |
|
38 |
new String[] { "element", "expressionbuilder-element" }, |
|
39 |
new String[] { "action", "common-filter" }, |
|
40 |
new String[] { "action", "expressionbuilder-insert-text" }, |
|
41 |
new String[] { "action", "common-sortdown" }, |
|
42 |
new String[] { "action", "common-sortup" }, |
|
43 |
new String[] { "action", "expressionbuilder-history" }, |
|
44 |
new String[] { "action", "expressionbuilder-bookmarks" }, |
|
45 |
new String[] { "action", "expressionbuilder-time-limit" } |
|
46 |
}; |
|
47 |
IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
|
48 |
for (String[] icon : iconNames) { |
|
49 |
URL url = this.getClass().getResource(icon[1]+".png"); |
|
50 |
theme.registerDefault("ExpressionBuilder", icon[0], icon[1], null, url); |
|
51 |
} |
|
30 |
// String[][] iconNames = new String[][] { |
|
31 |
// new String[] { "picker", "picker-expression" }, |
|
32 |
// new String[] { "expressionbuilder", "expressionbuilder-element-constant" }, |
|
33 |
// new String[] { "expressionbuilder", "expressionbuilder-element-function" }, |
|
34 |
// new String[] { "expressionbuilder", "expressionbuilder-element-function-sql" }, |
|
35 |
// new String[] { "expressionbuilder", "expressionbuilder-element-group" }, |
|
36 |
// new String[] { "expressionbuilder", "expressionbuilder-element" }, |
|
37 |
//// new String[] { "expressionbuilder", "common-filter" }, |
|
38 |
//// new String[] { "expressionbuilder", "expressionbuilder-insert-text" }, |
|
39 |
//// new String[] { "expressionbuilder", "common-sortdown" }, |
|
40 |
//// new String[] { "expressionbuilder", "common-sortup" }, |
|
41 |
//// new String[] { "expressionbuilder", "expressionbuilder-history" }, |
|
42 |
//// new String[] { "expressionbuilder", "expressionbuilder-bookmarks" }, |
|
43 |
// new String[] { "expressionbuilder", "expressionbuilder-time-limit" } |
|
44 |
// }; |
|
45 |
// IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
|
46 |
// for (String[] icon : iconNames) { |
|
47 |
// URL url = this.getClass().getResource(icon[1]+".png"); |
|
48 |
// theme.registerDefault("ExpressionBuilder", icon[0], icon[1], null, url); |
|
49 |
// } |
|
50 |
ToolsSwingUtils.registerIcons( |
|
51 |
this.getClass(), |
|
52 |
"/org/gvsig/expressionevaluator/swing/impl", |
|
53 |
"ExpressionBuilder", |
|
54 |
new String[] { "picker", "picker-expression", "expression" }, |
|
55 |
new String[] { "expressionbuilder", "expressionbuilder-element-constant", "element" }, |
|
56 |
new String[] { "expressionbuilder", "expressionbuilder-element-function", "element" }, |
|
57 |
new String[] { "expressionbuilder", "expressionbuilder-element-function-sql", "element" }, |
|
58 |
new String[] { "expressionbuilder", "expressionbuilder-element-group", "element" }, |
|
59 |
new String[] { "expressionbuilder", "expressionbuilder-element", "element" }, |
|
60 |
new String[] { "expressionbuilder", "expressionbuilder-time-limit" } |
|
61 |
); |
|
62 |
ToolsSwingUtils.registerGroupIconScreenshot( |
|
63 |
this.getClass(), |
|
64 |
"expressionbuilder", |
|
65 |
"/org/gvsig/expressionevaluator/swing/impl/screenshots/expressionbuilder1.png" |
|
66 |
); |
|
67 |
ToolsSwingUtils.registerGroupIconScreenshot( |
|
68 |
this.getClass(), |
|
69 |
"expressionbuilder", |
|
70 |
"/org/gvsig/expressionevaluator/swing/impl/screenshots/expressionbuilder2.png" |
|
71 |
); |
|
72 |
|
|
52 | 73 |
DynFormSPIManager dynFormManager = DynFormSPILocator.getDynFormSPIManager(); |
53 | 74 |
if( dynFormManager != null ) { |
54 | 75 |
dynFormManager.registerDynFieldFactory(new JDynFormFieldExpressionFactory()); |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultJExpressionBuilderView2.java | ||
---|---|---|
183 | 183 |
|
184 | 184 |
|
185 | 185 |
btnHistory.setActionCommand("+"); |
186 |
btnHistory.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-history.png"));
|
|
186 |
btnHistory.setIcon(loadImage("picker-history.png"));
|
|
187 | 187 |
btnHistory.setName("btnHistory"); |
188 | 188 |
btnHistory.setText(""); |
189 | 189 |
btnHistory.setBorder(emptyborder2x2); |
190 | 190 |
|
191 | 191 |
btnBookmarks.setActionCommand("+"); |
192 |
btnBookmarks.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-bookmarks.png"));
|
|
192 |
btnBookmarks.setIcon(loadImage("picker-bookmarks.png"));
|
|
193 | 193 |
btnBookmarks.setName("btnBookmarks"); |
194 | 194 |
btnBookmarks.setText(""); |
195 | 195 |
btnBookmarks.setBorder(emptyborder2x2); |
... | ... | |
237 | 237 |
lblMsg.setName("lblMsg"); |
238 | 238 |
|
239 | 239 |
btnTip.setActionCommand("+"); |
240 |
btnTip.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-tip.png.png"));
|
|
240 |
btnTip.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-tip.png")); |
|
241 | 241 |
btnTip.setName("btnTip"); |
242 | 242 |
btnTip.setBorder(emptyborder2x2); |
243 | 243 |
|
... | ... | |
249 | 249 |
txtGroupElement.setName("txtGroupElement"); |
250 | 250 |
|
251 | 251 |
btnGroupElementInsert.setActionCommand("+"); |
252 |
btnGroupElementInsert.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-insert-text.png"));
|
|
252 |
btnGroupElementInsert.setIcon(loadImage("common-add.png"));
|
|
253 | 253 |
btnGroupElementInsert.setName("btnGroupElementInsert"); |
254 | 254 |
btnGroupElementInsert.setBorder(emptyborder2x2); |
255 | 255 |
|
256 | 256 |
btnSimpleElementInsert.setActionCommand("+"); |
257 |
btnSimpleElementInsert.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/expressionbuilder-insert-text.png"));
|
|
257 |
btnSimpleElementInsert.setIcon(loadImage("common-add.png"));
|
|
258 | 258 |
btnSimpleElementInsert.setName("btnSimpleElementInsert"); |
259 | 259 |
btnSimpleElementInsert.setBorder(emptyborder2x2); |
260 | 260 |
|
261 | 261 |
btnSimpleElementSortDown.setActionCommand("+"); |
262 |
btnSimpleElementSortDown.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/common-sortdown.png"));
|
|
262 |
btnSimpleElementSortDown.setIcon(loadImage("common-sortdown.png")); |
|
263 | 263 |
btnSimpleElementSortDown.setName("btnSimpleElementSortDown"); |
264 | 264 |
btnSimpleElementSortDown.setBorder(emptyborder2x2); |
265 | 265 |
|
266 | 266 |
btnSimpleElementSortUp.setActionCommand("+"); |
267 |
btnSimpleElementSortUp.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/common-sortup.png"));
|
|
267 |
btnSimpleElementSortUp.setIcon(loadImage("common-sortup.png")); |
|
268 | 268 |
btnSimpleElementSortUp.setName("btnSimpleElementSortUp"); |
269 | 269 |
btnSimpleElementSortUp.setBorder(emptyborder2x2); |
270 | 270 |
|
... | ... | |
278 | 278 |
txtSimpleElementFilter.setName("txtSimpleElementFilter"); |
279 | 279 |
|
280 | 280 |
btnSimpleElementFilter.setActionCommand("+"); |
281 |
btnSimpleElementFilter.setIcon(loadImage("datos/devel/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/resources/org/gvsig/expressionevaluator/swing/impl/common-filter.png"));
|
|
281 |
btnSimpleElementFilter.setIcon(loadImage("common-filter.png")); |
|
282 | 282 |
btnSimpleElementFilter.setName("btnSimpleElementFilter"); |
283 | 283 |
btnSimpleElementFilter.setBorder(emptyborder2x2); |
284 | 284 |
} |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/ExportSwingLibraryImpl.java | ||
---|---|---|
52 | 52 |
|
53 | 53 |
@Override |
54 | 54 |
protected void doPostInitialize() throws LibraryException { |
55 |
String[][] iconNames = new String[][] { |
|
56 |
new String[] { "action", "column-query-calculated" }, |
|
57 |
new String[] { "action", "column-table-calculated" }, |
|
58 |
new String[] { "action", "column-true" } |
|
59 |
}; |
|
60 |
IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
|
61 |
for (String[] icon : iconNames) { |
|
62 |
URL url = this.getClass().getResource("/images/export-to/"+icon[1]+".png"); |
|
63 |
theme.registerDefault("Export", icon[0], icon[1], null, url); |
|
64 |
} |
|
65 |
|
|
55 |
// String[][] iconNames = new String[][] {
|
|
56 |
// new String[] { "action", "column-query-calculated" },
|
|
57 |
// new String[] { "action", "column-table-calculated" },
|
|
58 |
// new String[] { "action", "column-true" }
|
|
59 |
// };
|
|
60 |
// IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent();
|
|
61 |
// for (String[] icon : iconNames) {
|
|
62 |
// URL url = this.getClass().getResource("/images/export-to/"+icon[1]+".png");
|
|
63 |
// theme.registerDefault("Export", icon[0], icon[1], null, url);
|
|
64 |
// }
|
|
65 |
// |
|
66 | 66 |
} |
67 | 67 |
|
68 | 68 |
} |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.impl/src/main/java/org/gvsig/export/swing/impl/panels/SelectAttributesPanel.java | ||
---|---|---|
378 | 378 |
switch (origin) { |
379 | 379 |
case ORIGIN_QUERY_CALCULATED: |
380 | 380 |
this.setToolTipText(i18Manager.getTranslation("_Query_calculated_field")); |
381 |
this.setIcon((iconManager.get("column-query-calculated")));
|
|
381 |
this.setIcon((iconManager.get("featurestore-query-calculated-column")));
|
|
382 | 382 |
break; |
383 | 383 |
case ORIGIN_TABLE_CALCULATED: |
384 | 384 |
this.setToolTipText(i18Manager.getTranslation("_Table_calculated_field")); |
385 |
this.setIcon((iconManager.get("column-table-calculated")));
|
|
385 |
this.setIcon((iconManager.get("featurestore-calculated-column")));
|
|
386 | 386 |
break; |
387 | 387 |
case ORIGIN_REAL: |
388 | 388 |
this.setToolTipText(i18Manager.getTranslation("_Real_field")); |
389 |
this.setIcon((iconManager.get("column-true")));
|
|
389 |
this.setIcon((iconManager.get("featurestore-column")));
|
|
390 | 390 |
break; |
391 | 391 |
default: |
392 | 392 |
this.setText(value.toString()); |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/swing/pickercontroller/impl/EnvelopePickerControllerImpl.java | ||
---|---|---|
32 | 32 |
import org.gvsig.tools.i18n.I18nManager; |
33 | 33 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
34 | 34 |
import org.gvsig.tools.swing.api.ToolsSwingManager; |
35 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
|
35 | 36 |
import org.gvsig.tools.swing.api.pickercontroller.AbstractPickerController; |
36 | 37 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
37 | 38 |
import org.gvsig.tools.swing.icontheme.IconThemeManager; |
... | ... | |
45 | 46 |
|
46 | 47 |
public static void selfRegister() { |
47 | 48 |
IconThemeManager iconThemeManager = ToolsSwingLocator.getIconThemeManager(); |
48 |
IconTheme theme = iconThemeManager.getCurrent();
|
|
49 |
IconTheme theme = iconThemeManager.getActive();
|
|
49 | 50 |
|
50 | 51 |
URL url = ScalePickerControllerImpl.class.getClassLoader().getResource("images/picker-envelope-cursor-capture.png"); |
51 | 52 |
if( url != null ) { |
52 | 53 |
ImageIcon icon = new ImageIcon(url); |
53 |
theme.registerDefault("mapcontrol", "picker", "picker-envelope-cursor-capture", icon, url); |
|
54 |
theme.registerDefault("mapcontrol", "picker", "picker-envelope", "picker-envelope-cursor-capture", icon, url);
|
|
54 | 55 |
} |
55 | 56 |
url = ScalePickerControllerImpl.class.getClassLoader().getResource("images/picker-envelope-capture.png"); |
56 | 57 |
if( url != null ) { |
57 | 58 |
ImageIcon icon = new ImageIcon(url); |
58 |
theme.registerDefault("mapcontrol", "picker", "picker-envelope-capture", icon, url); |
|
59 |
theme.registerDefault("mapcontrol", "picker", "picker-envelope", "picker-envelope-capture", icon, url);
|
|
59 | 60 |
} |
60 | 61 |
url = ScalePickerControllerImpl.class.getClassLoader().getResource("images/picker-envelope-from-mapcontrol.png"); |
61 | 62 |
if( url != null ) { |
62 | 63 |
ImageIcon icon = new ImageIcon(url); |
63 |
theme.registerDefault("mapcontrol", "picker", "picker-envelope-from-mapcontrol", icon, url); |
|
64 |
theme.registerDefault("mapcontrol", "picker", "picker-envelope", "picker-envelope-from-mapcontrol", icon, url);
|
|
64 | 65 |
} |
65 |
} |
|
66 |
ToolsSwingUtils.registerSubgroupIconScreenshot( |
|
67 |
EnvelopePickerControllerImpl.class, |
|
68 |
"picker", |
|
69 |
"picker-envelope", |
|
70 |
"/images/screenshots/picker-envelope1.png" |
|
71 |
); |
|
72 |
} |
|
66 | 73 |
|
67 | 74 |
|
68 | 75 |
private class CaptureEnvelopeListener implements RectangleListener { |
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/swing/pickercontroller/impl/ScalePickerControllerImpl.java | ||
---|---|---|
51 | 51 |
URL url = ScalePickerControllerImpl.class.getClassLoader().getResource("images/picker-scale-cursor-capture.png"); |
52 | 52 |
if( url != null ) { |
53 | 53 |
ImageIcon icon = new ImageIcon(url); |
54 |
theme.registerDefault("mapcontrol", "picker", "picker-scale-cursor-capture", icon, url); |
|
54 |
theme.registerDefault("mapcontrol", "picker", "picker-scale", "picker-scale-cursor-capture", icon, url);
|
|
55 | 55 |
} |
56 | 56 |
url = ScalePickerControllerImpl.class.getClassLoader().getResource("images/picker-scale-capture.png"); |
57 | 57 |
if( url != null ) { |
58 | 58 |
ImageIcon icon = new ImageIcon(url); |
59 |
theme.registerDefault("mapcontrol", "picker", "picker-scale-capture", icon, url); |
|
59 |
theme.registerDefault("mapcontrol", "picker", "picker-scale", "picker-scale-capture", icon, url);
|
|
60 | 60 |
} |
61 | 61 |
url = ScalePickerControllerImpl.class.getClassLoader().getResource("images/picker-scale-from-mapcontrol.png"); |
62 | 62 |
if( url != null ) { |
63 | 63 |
ImageIcon icon = new ImageIcon(url); |
64 |
theme.registerDefault("mapcontrol", "picker", "picker-scale-from-mapcontrol", icon, url); |
|
64 |
theme.registerDefault("mapcontrol", "picker", "picker-scale", "picker-scale-from-mapcontrol", icon, url);
|
|
65 | 65 |
} |
66 | 66 |
} |
67 | 67 |
|
... | ... | |
119 | 119 |
|
120 | 120 |
private void initComponents() { |
121 | 121 |
this.captureCursor.setImage(this.getIcon("picker-scale-cursor-capture").getImage()); |
122 |
this.btnCapture.setIcon(this.getIcon("picker-scale-cursor-capture"));
|
|
123 |
this.btnMapControlScale.setIcon(this.getIcon("picker-scale-cursor-capture"));
|
|
122 |
this.btnCapture.setIcon(this.getIcon("picker-scale-capture")); |
|
123 |
this.btnMapControlScale.setIcon(this.getIcon("picker-scale-from-mapcontrol"));
|
|
124 | 124 |
|
125 | 125 |
Component comboEditor = this.cboScale.getEditor().getEditorComponent(); |
126 | 126 |
if( comboEditor instanceof JTextField ) { |
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/featureform/swing/impl/dynformfield/linkforeingkey/JDynFormFieldForeingKeyFactory.java | ||
---|---|---|
29 | 29 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
30 | 30 |
import org.gvsig.fmap.dal.feature.FeatureType; |
31 | 31 |
import org.gvsig.fmap.dal.feature.ForeingKey; |
32 |
import org.gvsig.fmap.dal.swing.impl.DefaultDALSwingLibrary; |
|
32 | 33 |
import static org.gvsig.fmap.dal.swing.impl.DefaultDALSwingLibrary.LIBRARY_NAME; |
33 | 34 |
import org.gvsig.tools.dataTypes.DataTypes; |
34 | 35 |
import org.gvsig.tools.dynform.DynFormFieldDefinition; |
... | ... | |
39 | 40 |
import org.gvsig.tools.dynform.spi.dynformfield.AbstractJDynFormFieldFactory; |
40 | 41 |
import org.gvsig.tools.locator.ReferenceNotRegisteredException; |
41 | 42 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
43 |
import org.gvsig.tools.swing.impl.ToolsSwingDefaultImplLibrary; |
|
42 | 44 |
|
43 | 45 |
public class JDynFormFieldForeingKeyFactory extends AbstractJDynFormFieldFactory { |
44 | 46 |
|
... | ... | |
88 | 90 |
manager.registerDynFieldFactory(new JDynFormFieldForeingKeyFactory()); |
89 | 91 |
|
90 | 92 |
boolean n = ToolsSwingUtils.registerIcons( |
91 |
DefaultJFeaturesForm.class,
|
|
93 |
DefaultDALSwingLibrary.class,
|
|
92 | 94 |
"/org/gvsig/featureform/swing/impl", |
93 | 95 |
LIBRARY_NAME, |
94 |
new String[]{ "picker", "picker-foreingkey-link"}, |
|
95 |
new String[]{ "picker", "picker-foreingkey-unlink"}, |
|
96 |
new String[]{ "picker", "picker-foreingkey-showform"} |
|
96 |
new String[]{ "picker", "picker-foreingkey-link", "picker-foreingkey"},
|
|
97 |
new String[]{ "picker", "picker-foreingkey-unlink", "picker-foreingkey"},
|
|
98 |
new String[]{ "picker", "picker-foreingkey-showform", "picker-foreingkey"}
|
|
97 | 99 |
); |
100 |
ToolsSwingUtils.registerSubgroupIconScreenshot( |
|
101 |
DefaultDALSwingLibrary.class, |
|
102 |
"picker", |
|
103 |
"picker-foreingkey", |
|
104 |
"/org/gvsig/fmap/dal/screenshots/picker-foreingkey.png" |
|
105 |
); |
|
98 | 106 |
} |
99 | 107 |
|
100 | 108 |
} |
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/featureform/swing/impl/dynformfield/ImageFile/JDynFormFieldImageFileFactory.java | ||
---|---|---|
63 | 63 |
} |
64 | 64 |
manager.registerDynFieldFactory(new JDynFormFieldImageFileFactory()); |
65 | 65 |
|
66 |
boolean n = ToolsSwingUtils.registerIcons( |
|
67 |
DefaultJFeaturesForm.class, |
|
68 |
null, |
|
69 |
LIBRARY_NAME, |
|
70 |
new String[]{ "form", "form-open-image"} |
|
71 |
); |
|
66 |
// boolean n = ToolsSwingUtils.registerIcons(
|
|
67 |
// DefaultJFeaturesForm.class,
|
|
68 |
// null,
|
|
69 |
// LIBRARY_NAME,
|
|
70 |
// new String[]{ "form", "form-open-image"}
|
|
71 |
// );
|
|
72 | 72 |
|
73 | 73 |
} |
74 | 74 |
} |
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/DefaultDataSwingManager.java | ||
---|---|---|
24 | 24 |
|
25 | 25 |
import java.awt.Component; |
26 | 26 |
import java.awt.event.ActionEvent; |
27 |
import java.net.URL; |
|
28 | 27 |
import java.util.ArrayList; |
29 | 28 |
import java.util.Collection; |
30 | 29 |
import java.util.Collections; |
... | ... | |
161 | 160 |
import org.gvsig.tools.exception.BaseException; |
162 | 161 |
import org.gvsig.tools.i18n.I18nManager; |
163 | 162 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
164 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
|
165 | 163 |
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager; |
166 | 164 |
import org.gvsig.tools.swing.api.windowmanager.WindowManager; |
167 |
import org.gvsig.tools.util.Factory;
|
|
165 |
import org.gvsig.tools.swing.icontheme.IconTheme;
|
|
168 | 166 |
import org.slf4j.Logger; |
169 | 167 |
import org.slf4j.LoggerFactory; |
170 | 168 |
|
... | ... | |
806 | 804 |
if (!store.isFeatureSelectionEmpty()) { |
807 | 805 |
name = name + "-sel"; |
808 | 806 |
} |
809 |
name = name + ".png"; |
|
810 |
URL url = this.getClass().getResource("/storegeomtypes/" + name); |
|
811 |
if (url == null) { |
|
812 |
return null; |
|
813 |
} |
|
814 |
Icon icon = new ImageIcon(url); |
|
807 |
IconTheme themeIcon = ToolsSwingLocator.getIconThemeManager().getActive(); |
|
808 |
ImageIcon icon = themeIcon.get(name); |
|
809 |
// name = name + ".png"; |
|
810 |
// URL url = this.getClass().getResource("/storegeomtypes/" + name); |
|
811 |
// if (url == null) { |
|
812 |
// return null; |
|
813 |
// } |
|
814 |
// Icon icon = new ImageIcon(url); |
|
815 | 815 |
return icon; |
816 | 816 |
} catch (Exception ex) { |
817 | 817 |
return null; |
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/DefaultFeatureQueryCalculatedColumnsPanel.java | ||
---|---|---|
629 | 629 |
} |
630 | 630 |
|
631 | 631 |
public static void selfRegister() { |
632 |
boolean n = ToolsSwingUtils.registerIcons( |
|
633 |
DefaultFeatureQueryOrderPanel.class, |
|
634 |
null, |
|
635 |
LIBRARY_NAME, |
|
636 |
new String[]{ "featurequery", "featurequery-column-add"}, |
|
637 |
new String[]{ "featurequery", "featurequery-column-remove"}, |
|
638 |
new String[]{ "featurequery", "featurequery-column-down"}, |
|
639 |
new String[]{ "featurequery", "featurequery-column-up"} |
|
640 |
); |
|
632 |
// boolean n = ToolsSwingUtils.registerIcons(
|
|
633 |
// DefaultFeatureQueryOrderPanel.class,
|
|
634 |
// null,
|
|
635 |
// LIBRARY_NAME,
|
|
636 |
// new String[]{ "featurequery", "featurequery-column-add"},
|
|
637 |
// new String[]{ "featurequery", "featurequery-column-remove"},
|
|
638 |
// new String[]{ "featurequery", "featurequery-column-down"},
|
|
639 |
// new String[]{ "featurequery", "featurequery-column-up"}
|
|
640 |
// );
|
|
641 | 641 |
} |
642 | 642 |
|
643 | 643 |
private void doAdd() { |
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/DefaultFeatureQueryOrderPanelView.java | ||
---|---|---|
155 | 155 |
jpanel1.setLayout(formlayout1); |
156 | 156 |
|
157 | 157 |
btnColumnDown.setActionCommand("..."); |
158 |
btnColumnDown.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-down.png"));
|
|
158 |
btnColumnDown.setIcon(loadImage("common-arrow-down.png"));
|
|
159 | 159 |
btnColumnDown.setName("btnColumnDown"); |
160 | 160 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
161 | 161 |
btnColumnDown.setBorder(emptyborder1); |
162 | 162 |
jpanel1.add(btnColumnDown,cc.xy(8,1)); |
163 | 163 |
|
164 | 164 |
btnColumnUp.setActionCommand("..."); |
165 |
btnColumnUp.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-up.png"));
|
|
165 |
btnColumnUp.setIcon(loadImage("common-arrow-up.png"));
|
|
166 | 166 |
btnColumnUp.setName("btnColumnUp"); |
167 | 167 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
168 | 168 |
btnColumnUp.setBorder(emptyborder2); |
169 | 169 |
jpanel1.add(btnColumnUp,cc.xy(6,1)); |
170 | 170 |
|
171 |
btnColumnSortAscending.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-sortup.png"));
|
|
171 |
btnColumnSortAscending.setIcon(loadImage("common-sortup.png")); |
|
172 | 172 |
btnColumnSortAscending.setName("btnColumnSortAscending"); |
173 | 173 |
EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2); |
174 | 174 |
btnColumnSortAscending.setBorder(emptyborder3); |
175 | 175 |
jpanel1.add(btnColumnSortAscending,cc.xy(2,1)); |
176 | 176 |
|
177 |
btnColumnSortDescending.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-sortdown.png"));
|
|
177 |
btnColumnSortDescending.setIcon(loadImage("common-sortdown.png")); |
|
178 | 178 |
btnColumnSortDescending.setName("btnColumnSortDescending"); |
179 | 179 |
EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2); |
180 | 180 |
btnColumnSortDescending.setBorder(emptyborder4); |
... | ... | |
192 | 192 |
jpanel1.setLayout(formlayout1); |
193 | 193 |
|
194 | 194 |
btnColumnAdd.setActionCommand("..."); |
195 |
btnColumnAdd.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-add-arrow.png"));
|
|
195 |
btnColumnAdd.setIcon(loadImage("common-arrow-right.png"));
|
|
196 | 196 |
btnColumnAdd.setName("btnColumnAdd"); |
197 | 197 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
198 | 198 |
btnColumnAdd.setBorder(emptyborder1); |
199 | 199 |
jpanel1.add(btnColumnAdd,cc.xy(1,1)); |
200 | 200 |
|
201 | 201 |
btnColumnRemove.setActionCommand("..."); |
202 |
btnColumnRemove.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-remove-arrow.png"));
|
|
202 |
btnColumnRemove.setIcon(loadImage("common-arrow-left.png"));
|
|
203 | 203 |
btnColumnRemove.setName("btnColumnRemove"); |
204 | 204 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
205 | 205 |
btnColumnRemove.setBorder(emptyborder2); |
... | ... | |
220 | 220 |
jpanel1.add(txtColumnsFilter,cc.xy(1,1)); |
221 | 221 |
|
222 | 222 |
btnColumnsFilter.setActionCommand("..."); |
223 |
btnColumnsFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-filter.png"));
|
|
223 |
btnColumnsFilter.setIcon(loadImage("common-filter.png")); |
|
224 | 224 |
btnColumnsFilter.setName("btnColumnsFilter"); |
225 | 225 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
226 | 226 |
btnColumnsFilter.setBorder(emptyborder1); |
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 | ||
---|---|---|
350 | 350 |
} |
351 | 351 |
|
352 | 352 |
public static void selfRegister() { |
353 |
boolean n = ToolsSwingUtils.registerIcons( |
|
354 |
DefaultFeatureQueryOrderPanel.class, |
|
355 |
null, |
|
356 |
LIBRARY_NAME, |
|
357 |
new String[]{ "featurequery", "featurequery-column-add-arrow"}, |
|
358 |
new String[]{ "featurequery", "featurequery-column-remove-arrow"}, |
|
359 |
new String[]{ "featurequery", "featurequery-column-down"}, |
|
360 |
new String[]{ "featurequery", "featurequery-column-up"} |
|
361 |
); |
|
353 |
// boolean n = ToolsSwingUtils.registerIcons(
|
|
354 |
// DefaultFeatureQueryOrderPanel.class,
|
|
355 |
// null,
|
|
356 |
// LIBRARY_NAME,
|
|
357 |
// new String[]{ "featurequery", "featurequery-column-add-arrow"},
|
|
358 |
// new String[]{ "featurequery", "featurequery-column-remove-arrow"},
|
|
359 |
// new String[]{ "featurequery", "featurequery-column-down"},
|
|
360 |
// new String[]{ "featurequery", "featurequery-column-up"}
|
|
361 |
// );
|
|
362 | 362 |
} |
363 | 363 |
} |
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 | ||
---|---|---|
162 | 162 |
jpanel1.setLayout(formlayout1); |
163 | 163 |
|
164 | 164 |
btnDown.setActionCommand("..."); |
165 |
btnDown.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-down.png"));
|
|
165 |
btnDown.setIcon(loadImage("common-arrow-down.png"));
|
|
166 | 166 |
btnDown.setName("btnDown"); |
167 | 167 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
168 | 168 |
btnDown.setBorder(emptyborder1); |
169 | 169 |
jpanel1.add(btnDown,cc.xy(9,1)); |
170 | 170 |
|
171 | 171 |
btnUp.setActionCommand("..."); |
172 |
btnUp.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-up.png"));
|
|
172 |
btnUp.setIcon(loadImage("common-arrow-up.png"));
|
|
173 | 173 |
btnUp.setName("btnUp"); |
174 | 174 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
175 | 175 |
btnUp.setBorder(emptyborder2); |
176 | 176 |
jpanel1.add(btnUp,cc.xy(7,1)); |
177 | 177 |
|
178 | 178 |
btnRemove.setActionCommand("..."); |
179 |
btnRemove.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-remove.png"));
|
|
179 |
btnRemove.setIcon(loadImage("common-arrow-left.png"));
|
|
180 | 180 |
btnRemove.setName("btnRemove"); |
181 | 181 |
EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2); |
182 | 182 |
btnRemove.setBorder(emptyborder3); |
183 | 183 |
jpanel1.add(btnRemove,cc.xy(5,1)); |
184 | 184 |
|
185 | 185 |
btnAdd.setActionCommand("..."); |
186 |
btnAdd.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/featurequery-column-add.png"));
|
|
186 |
btnAdd.setIcon(loadImage("common-arrow-right.png"));
|
|
187 | 187 |
btnAdd.setName("btnAdd"); |
188 | 188 |
EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2); |
189 | 189 |
btnAdd.setBorder(emptyborder4); |
... | ... | |
216 | 216 |
jpanel1.add(txtColumnName,cc.xywh(3,1,3,1)); |
217 | 217 |
|
218 | 218 |
btnColumnDataType.setActionCommand("..."); |
219 |
btnColumnDataType.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-more.png"));
|
|
219 |
btnColumnDataType.setIcon(loadImage("common-more.png")); |
|
220 | 220 |
btnColumnDataType.setName("btnColumnDataType"); |
221 | 221 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
222 | 222 |
btnColumnDataType.setBorder(emptyborder1); |
... | ... | |
267 | 267 |
jpanel1.setLayout(formlayout1); |
268 | 268 |
|
269 | 269 |
btnApplyChanges.setActionCommand("..."); |
270 |
btnApplyChanges.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-applychanges.png"));
|
|
270 |
btnApplyChanges.setIcon(loadImage("common-applychanges.png")); |
|
271 | 271 |
btnApplyChanges.setName("btnApplyChanges"); |
272 | 272 |
btnApplyChanges.setText("_Apply_changes"); |
273 | 273 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
... | ... | |
275 | 275 |
jpanel1.add(btnApplyChanges,cc.xy(5,1)); |
276 | 276 |
|
277 | 277 |
btnColumnMore.setActionCommand("..."); |
278 |
btnColumnMore.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featurequery/common-more.png"));
|
|
278 |
btnColumnMore.setIcon(loadImage("common-more.png")); |
|
279 | 279 |
btnColumnMore.setName("btnColumnMore"); |
280 | 280 |
btnColumnMore.setText("_More"); |
281 | 281 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
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/DefaultDALSwingLibrary.java | ||
---|---|---|
80 | 80 |
import org.gvsig.tools.library.AbstractLibrary; |
81 | 81 |
import org.gvsig.tools.library.LibraryException; |
82 | 82 |
import org.gvsig.tools.locator.ReferenceNotRegisteredException; |
83 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
|
83 | 84 |
import org.slf4j.Logger; |
84 | 85 |
import org.slf4j.LoggerFactory; |
85 | 86 |
|
... | ... | |
151 | 152 |
LOGGER.debug("Can't locate DataStoreParametersPanelManager"); |
152 | 153 |
} |
153 | 154 |
|
154 |
|
|
155 |
registerIcons(); |
|
156 |
|
|
155 | 157 |
DefaultEditingNotificationManager.selfRegister(); |
156 | 158 |
ProjectionPickerControllerImpl.selfRegister(); |
157 | 159 |
|
... | ... | |
191 | 193 |
LOGGER.warn("Can't register DAL components in ExpressionEvaluator",ex); |
192 | 194 |
} |
193 | 195 |
} |
196 |
|
|
197 |
private void registerIcons() { |
|
198 |
ToolsSwingUtils.registerIcons( |
|
199 |
DefaultDALSwingLibrary.class, |
|
200 |
"/org/gvsig/fmap/dal/images", |
|
201 |
LIBRARY_NAME, |
|
202 |
new String[]{"dal", "featurestore-column", "featurestore-members"}, |
|
203 |
new String[]{"dal", "featurestore-foreing-key", "featurestore-members"}, |
|
204 |
new String[]{"dal", "featurestore-table", "featurestore-members"}, |
|
205 |
new String[]{"dal", "featurestore-calculated-column", "featurestore-members"}, |
|
206 |
new String[]{"dal", "featurestore-query-calculated-column", "featurestore-members"} |
|
207 |
); |
|
208 |
ToolsSwingUtils.registerSubgroupIconScreenshot( |
|
209 |
DefaultDALSwingLibrary.class, |
|
210 |
"dal", |
|
211 |
"featurestore-members", |
|
212 |
"/org/gvsig/fmap/dal/screenshots/featurestore-members.png" |
|
213 |
); |
|
194 | 214 |
|
215 |
ToolsSwingUtils.registerIcons( |
|
216 |
DefaultDALSwingLibrary.class, |
|
217 |
"/org/gvsig/fmap/dal/storegeomtypes", |
|
218 |
LIBRARY_NAME, |
|
219 |
new String[]{"storegeomtypes", "store-geomtype-line-sel"}, |
|
220 |
new String[]{"storegeomtypes", "store-geomtype-line"}, |
|
221 |
new String[]{"storegeomtypes", "store-geomtype-mix-sel"}, |
|
222 |
new String[]{"storegeomtypes", "store-geomtype-mix"}, |
|
223 |
new String[]{"storegeomtypes", "store-geomtype-multiline-sel"}, |
|
224 |
new String[]{"storegeomtypes", "store-geomtype-multiline"}, |
|
225 |
new String[]{"storegeomtypes", "store-geomtype-multipoint-sel"}, |
|
226 |
new String[]{"storegeomtypes", "store-geomtype-multipoint"}, |
|
227 |
new String[]{"storegeomtypes", "store-geomtype-multipolygon-sel"}, |
|
228 |
new String[]{"storegeomtypes", "store-geomtype-multipolygon"}, |
|
229 |
new String[]{"storegeomtypes", "store-geomtype-point-sel"}, |
|
230 |
new String[]{"storegeomtypes", "store-geomtype-point"}, |
|
231 |
new String[]{"storegeomtypes", "store-geomtype-polygon-sel"}, |
|
232 |
new String[]{"storegeomtypes", "store-geomtype-polygon"}, |
|
233 |
new String[]{"storegeomtypes", "store-geomtype-raster"}, |
|
234 |
|
|
235 |
new String[]{"storegeomtypes", "store-geomtype-wrong"} |
|
236 |
); |
|
237 |
ToolsSwingUtils.registerGroupIconDescription( |
|
238 |
"storegeomtypes", |
|
239 |
"Images used in lists, dropdowns, and trees displaying layer names to indicate the type of geometry of the layer." |
|
240 |
); |
|
241 |
|
|
242 |
} |
|
243 |
|
|
195 | 244 |
} |
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/expressionevaluator/FeatureStoreElementFactory.java | ||
---|---|---|
50 | 50 |
FeatureStoreElementFactory.class, |
51 | 51 |
"/org/gvsig/fmap/dal/swing/impl/expressionevaluator", |
52 | 52 |
LIBRARY_NAME, |
53 |
new String[]{ "element", "expressionbuilder-element-table"},
|
|
54 |
new String[]{ "element", "expressionbuilder-element-table-field"}
|
|
53 |
new String[]{ "expressionbuilder", "expressionbuilder-element-table", "element"},
|
|
54 |
new String[]{ "expressionbuilder", "expressionbuilder-element-table-field", "element"}
|
|
55 | 55 |
); |
56 | 56 |
} |
57 | 57 |
} |
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/jdbc/JDBCConnectionPickerControllerImpl.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import org.gvsig.fmap.dal.swing.jdbc.JDBCServerExplorerParametersController; |
4 | 4 |
import java.awt.event.ActionEvent; |
5 |
import java.awt.event.ActionListener; |
|
6 | 5 |
import java.awt.event.ItemEvent; |
7 |
import java.awt.event.ItemListener; |
|
8 |
import java.net.URL; |
|
9 | 6 |
import java.util.ArrayList; |
10 | 7 |
import java.util.List; |
11 |
import java.util.function.Consumer; |
|
12 | 8 |
import javax.swing.ComboBoxModel; |
13 | 9 |
import javax.swing.JButton; |
14 | 10 |
import javax.swing.JComboBox; |
... | ... | |
22 | 18 |
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters; |
23 | 19 |
import org.gvsig.fmap.dal.swing.DALSwingLocator; |
24 | 20 |
import static org.gvsig.fmap.dal.swing.impl.DefaultDALSwingLibrary.LIBRARY_NAME; |
25 |
import org.gvsig.fmap.dal.swing.impl.featuretype.DefaultFeatureAttributesSelectionPanel; |
|
26 | 21 |
import org.gvsig.fmap.dal.swing.jdbc.JDBCConnectionDialog; |
27 |
import org.gvsig.tools.locator.ReferenceNotRegisteredException; |
|
28 | 22 |
import org.gvsig.tools.swing.api.ListElement; |
29 | 23 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
30 | 24 |
import org.gvsig.tools.swing.api.ToolsSwingUtils; |
31 | 25 |
import org.gvsig.tools.swing.api.pickercontroller.AbstractPickerController; |
32 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
|
33 | 26 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
34 |
import org.gvsig.tools.util.CompareUtils; |
|
35 |
import org.gvsig.tools.util.CompareUtils.NullSafeComparator; |
|
36 | 27 |
|
37 | 28 |
/** |
38 | 29 |
* |
... | ... | |
184 | 175 |
boolean n = ToolsSwingUtils.registerIcons(JDBCConnectionPickerControllerImpl.class, |
185 | 176 |
null, |
186 | 177 |
LIBRARY_NAME, |
187 |
new String[]{ "picker", "picker-dbconnection"} |
|
178 |
new String[]{ "picker", "picker-dbconnection", "picker-dbconnection"}
|
|
188 | 179 |
); |
189 | 180 |
} |
190 | 181 |
|
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/searchpanel/DefaultSearchPanelView.java | ||
---|---|---|
274 | 274 |
lblField4.setHorizontalAlignment(JLabel.CENTER); |
275 | 275 |
jpanel1.add(lblField4,cc.xy(20,2)); |
276 | 276 |
|
277 |
lblExtraFields1.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png"));
|
|
277 |
lblExtraFields1.setIcon(loadImage("search-select-column.png"));
|
|
278 | 278 |
lblExtraFields1.setName("lblExtraFields1"); |
279 | 279 |
jpanel1.add(lblExtraFields1,cc.xy(4,2)); |
280 | 280 |
|
281 |
lblExtraFields2.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png"));
|
|
281 |
lblExtraFields2.setIcon(loadImage("search-select-column.png"));
|
|
282 | 282 |
lblExtraFields2.setName("lblExtraFields2"); |
283 | 283 |
jpanel1.add(lblExtraFields2,cc.xy(10,2)); |
284 | 284 |
|
285 |
lblExtraFields3.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png"));
|
|
285 |
lblExtraFields3.setIcon(loadImage("search-select-column.png"));
|
|
286 | 286 |
lblExtraFields3.setName("lblExtraFields3"); |
287 | 287 |
jpanel1.add(lblExtraFields3,cc.xy(16,2)); |
288 | 288 |
|
289 |
lblExtraFields4.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png"));
|
|
289 |
lblExtraFields4.setIcon(loadImage("search-select-column.png"));
|
|
290 | 290 |
lblExtraFields4.setName("lblExtraFields4"); |
291 | 291 |
jpanel1.add(lblExtraFields4,cc.xy(21,2)); |
292 | 292 |
|
... | ... | |
328 | 328 |
jpanel1.setLayout(formlayout1); |
329 | 329 |
|
330 | 330 |
btnRemoveAccumulatedFilter.setActionCommand("..."); |
331 |
btnRemoveAccumulatedFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/search-simplifiedcondition-clear-accumulate.png"));
|
|
331 |
btnRemoveAccumulatedFilter.setIcon(loadImage("search-simplifiedcondition-clear-accumulate.png")); |
|
332 | 332 |
btnRemoveAccumulatedFilter.setName("btnRemoveAccumulatedFilter"); |
333 | 333 |
btnRemoveAccumulatedFilter.setToolTipText("_Remove_accumulated_filter"); |
334 | 334 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
... | ... | |
336 | 336 |
jpanel1.add(btnRemoveAccumulatedFilter,cc.xy(3,1)); |
337 | 337 |
|
338 | 338 |
btnAddAccumulatedFilter.setActionCommand("..."); |
339 |
btnAddAccumulatedFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/search-simplifiedcondition-add-accumulate.png"));
|
|
339 |
btnAddAccumulatedFilter.setIcon(loadImage("search-simplifiedcondition-add-accumulate.png")); |
|
340 | 340 |
btnAddAccumulatedFilter.setName("btnAddAccumulatedFilter"); |
341 | 341 |
btnAddAccumulatedFilter.setToolTipText("_Accumulate_filter"); |
342 | 342 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
... | ... | |
344 | 344 |
jpanel1.add(btnAddAccumulatedFilter,cc.xy(7,1)); |
345 | 345 |
|
346 | 346 |
btnViewAccumulatedFilter.setActionCommand("..."); |
347 |
btnViewAccumulatedFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/search-simplifiedcondition-edit-accumulate.png"));
|
|
347 |
btnViewAccumulatedFilter.setIcon(loadImage("search-simplifiedcondition-edit-accumulate.png")); |
|
348 | 348 |
btnViewAccumulatedFilter.setName("btnViewAccumulatedFilter"); |
349 | 349 |
btnViewAccumulatedFilter.setToolTipText("_View_accumulated_filter"); |
350 | 350 |
EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2); |
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/searchpanel/DefaultSearchPanel.java | ||
---|---|---|
86 | 86 |
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryOrderPanel; |
87 | 87 |
import org.gvsig.fmap.dal.swing.featuretable.SimpleFeaturesTableModel; |
88 | 88 |
import org.gvsig.fmap.dal.swing.featuretype.FeatureAttributesSelectionPanel; |
89 |
import org.gvsig.fmap.dal.swing.impl.DefaultDALSwingLibrary; |
|
89 | 90 |
import static org.gvsig.fmap.dal.swing.impl.DefaultDALSwingLibrary.LIBRARY_NAME; |
90 | 91 |
import org.gvsig.fmap.dal.swing.impl.featurequery.DefaultFeatureQueryCalculatedColumnsPanel; |
91 | 92 |
import org.gvsig.fmap.dal.swing.impl.featuretable.SimpleFeaturesTableModelImpl; |
... | ... | |
1924 | 1925 |
DefaultSearchPanel.class, |
1925 | 1926 |
"", |
1926 | 1927 |
LIBRARY_NAME, |
1927 |
new String[]{"search", "featurestore-column"}, |
|
1928 |
new String[]{"search", "featurestore-foreing-key"}, |
|
1929 |
new String[]{"search", "featurestore-table"}, |
|
1930 |
new String[]{"search", "search-action-select"}, |
|
1931 |
new String[]{"search", "search-action-select-add"}, |
|
1932 |
new String[]{"search", "search-action-select-filter"}, |
|
1933 |
new String[]{"search", "search-nullbehavior-null"}, |
|
1934 |
new String[]{"search", "search-nullbehavior-true"}, |
|
1935 |
new String[]{"search", "search-nullbehavior-false"}, |
|
1936 |
new String[]{"search", "search-geometry-select"} |
|
1928 |
new String[]{"storeaction", "storeaction-select"}, |
|
1929 |
new String[]{"storeaction", "storeaction-select-add"}, |
|
1930 |
new String[]{"storeaction", "storeaction-select-filter"}, |
|
1931 |
|
|
1932 |
new String[]{"storesearch", "search-simplifiedcondition-edit-accumulate"}, |
|
1933 |
new String[]{"storesearch", "search-simplifiedcondition-clear-accumulate"}, |
|
1934 |
new String[]{"storesearch", "search-simplifiedcondition-add-accumulate"}, |
|
1935 |
|
|
1936 |
new String[]{"storesearch", "search-nullbehavior-null"}, |
|
1937 |
new String[]{"storesearch", "search-nullbehavior-true"}, |
|
1938 |
new String[]{"storesearch", "search-nullbehavior-false"}, |
|
1939 |
|
|
1940 |
new String[]{"storesearch", "search-geometry-select"}, |
|
1941 |
|
|
1942 |
new String[]{"storesearch", "search-select-column"} |
|
1943 |
|
|
1937 | 1944 |
); |
1938 |
|
|
1945 |
ToolsSwingUtils.registerGroupIconScreenshot( |
|
1946 |
DefaultDALSwingLibrary.class, |
|
1947 |
"storesearch", |
|
1948 |
"/org/gvsig/fmap/dal/screenshots/storesearch1.png" |
|
1949 |
); |
|
1939 | 1950 |
ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager(); |
1940 | 1951 |
cfgActionsManager.addConfigurableAction(CONFIGURABLE_PANEL_ID, new UseLabelsYesAction()); |
1941 | 1952 |
cfgActionsManager.addConfigurableAction(CONFIGURABLE_PANEL_ID, new UseLabelsNoAction()); |
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/searchpanel/DefaultSearchPanelView.xml | ||
---|---|---|
1019 | 1019 |
<at name="icon"> |
1020 | 1020 |
<object classname="com.jeta.forms.store.properties.IconProperty"> |
1021 | 1021 |
<at name="embedded">false</at> |
1022 |
<at name="path">src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png</at>
|
|
1023 |
<at name="description">featurestore-column.png</at>
|
|
1022 |
<at name="path">search-select-column.png</at>
|
|
1023 |
<at name="description">search-select-column.png</at>
|
|
1024 | 1024 |
<at name="width">16</at> |
1025 | 1025 |
<at name="height">16</at> |
1026 | 1026 |
</object> |
... | ... | |
1087 | 1087 |
<at name="icon"> |
1088 | 1088 |
<object classname="com.jeta.forms.store.properties.IconProperty"> |
1089 | 1089 |
<at name="embedded">false</at> |
1090 |
<at name="path">src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png</at>
|
|
1091 |
<at name="description">featurestore-column.png</at>
|
|
1090 |
<at name="path">search-select-column.png</at>
|
|
1091 |
<at name="description">search-select-column.png</at>
|
|
1092 | 1092 |
<at name="width">16</at> |
1093 | 1093 |
<at name="height">16</at> |
1094 | 1094 |
</object> |
... | ... | |
1155 | 1155 |
<at name="icon"> |
1156 | 1156 |
<object classname="com.jeta.forms.store.properties.IconProperty"> |
1157 | 1157 |
<at name="embedded">false</at> |
1158 |
<at name="path">src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png</at>
|
|
1159 |
<at name="description">featurestore-column.png</at>
|
|
1158 |
<at name="path">search-select-column.png</at>
|
|
1159 |
<at name="description">search-select-column.png</at>
|
|
1160 | 1160 |
<at name="width">16</at> |
1161 | 1161 |
<at name="height">16</at> |
1162 | 1162 |
</object> |
... | ... | |
1223 | 1223 |
<at name="icon"> |
1224 | 1224 |
<object classname="com.jeta.forms.store.properties.IconProperty"> |
1225 | 1225 |
<at name="embedded">false</at> |
1226 |
<at name="path">src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/featurestore-column.png</at>
|
|
1227 |
<at name="description">featurestore-column.png</at>
|
|
1226 |
<at name="path">search-select-column.png</at>
|
|
1227 |
<at name="description">search-select-column.png</at>
|
|
1228 | 1228 |
<at name="width">16</at> |
1229 | 1229 |
<at name="height">16</at> |
1230 | 1230 |
</object> |
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/searchpanel/DefaultSearchPanelView2.java | ||
---|---|---|
186 | 186 |
jpanel1.setLayout(formlayout1); |
187 | 187 |
|
188 | 188 |
btnRemoveAccumulatedFilter.setActionCommand("..."); |
189 |
btnRemoveAccumulatedFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/search-simplifiedcondition-clear-accumulate.png"));
|
|
189 |
btnRemoveAccumulatedFilter.setIcon(loadImage("search-simplifiedcondition-clear-accumulate.png")); |
|
190 | 190 |
btnRemoveAccumulatedFilter.setName("btnRemoveAccumulatedFilter"); |
191 | 191 |
btnRemoveAccumulatedFilter.setToolTipText("_Remove_accumulated_filter"); |
192 | 192 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
... | ... | |
194 | 194 |
jpanel1.add(btnRemoveAccumulatedFilter,cc.xy(3,1)); |
195 | 195 |
|
196 | 196 |
btnAddAccumulatedFilter.setActionCommand("..."); |
197 |
btnAddAccumulatedFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/search-simplifiedcondition-add-accumulate.png"));
|
|
197 |
btnAddAccumulatedFilter.setIcon(loadImage("search-simplifiedcondition-add-accumulate.png")); |
|
198 | 198 |
btnAddAccumulatedFilter.setName("btnAddAccumulatedFilter"); |
199 | 199 |
btnAddAccumulatedFilter.setToolTipText("_Accumulate_filter"); |
200 | 200 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
... | ... | |
202 | 202 |
jpanel1.add(btnAddAccumulatedFilter,cc.xy(7,1)); |
203 | 203 |
|
204 | 204 |
btnViewAccumulatedFilter.setActionCommand("..."); |
205 |
btnViewAccumulatedFilter.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/searchpanel/search-simplifiedcondition-edit-accumulate.png"));
|
|
205 |
btnViewAccumulatedFilter.setIcon(loadImage("search-simplifiedcondition-edit-accumulate.png")); |
|
206 | 206 |
btnViewAccumulatedFilter.setName("btnViewAccumulatedFilter"); |
207 | 207 |
btnViewAccumulatedFilter.setToolTipText("_View_accumulated_filter"); |
208 | 208 |
EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2); |
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/searchpanel/SearchConditionFieldView.java | ||
---|---|---|
35 | 35 |
@SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"}) |
36 | 36 |
public SearchConditionFieldView() { |
37 | 37 |
this.lblFields = new JLabel(); |
38 |
this.lblExtraFields = new JLabel(ToolsSwingUtils.loadImage(this, "featurestore-column"));
|
|
38 |
this.lblExtraFields = new JLabel(ToolsSwingUtils.loadImage(this, "search-select-column"));
|
|
39 | 39 |
this.lblRelationalOperators = new JLabel("WWWW"); |
40 | 40 |
this.cboValue = new JComboBox(); |
41 | 41 |
this.txtValue = new JTextField(); |
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/featuretype/DefaultFeatureAttributesSelectionPanel.java | ||
---|---|---|
488 | 488 |
} |
489 | 489 |
|
490 | 490 |
public static void selfRegister() { |
491 |
boolean n = ToolsSwingUtils.registerIcons( |
|
492 |
DefaultFeatureAttributesSelectionPanel.class, |
|
493 |
null, |
|
494 |
LIBRARY_NAME, |
|
495 |
new String[]{ "featuretype", "featuretype-column-add-arrow"}, |
|
496 |
new String[]{ "featuretype", "featuretype-column-remove-arrow"}, |
|
497 |
new String[]{ "featuretype", "featuretype-column-down"}, |
|
498 |
new String[]{ "featuretype", "featuretype-column-up"} |
|
499 |
); |
|
491 |
// boolean n = ToolsSwingUtils.registerIcons(
|
|
492 |
// DefaultFeatureAttributesSelectionPanel.class,
|
|
493 |
// null,
|
|
494 |
// LIBRARY_NAME,
|
|
495 |
// new String[]{ "featuretype", "featuretype-column-add-arrow"},
|
|
496 |
// new String[]{ "featuretype", "featuretype-column-remove-arrow"},
|
|
497 |
// new String[]{ "featuretype", "featuretype-column-down"},
|
|
498 |
// new String[]{ "featuretype", "featuretype-column-up"}
|
|
499 |
// );
|
|
500 | 500 |
} |
501 | 501 |
|
502 | 502 |
@Override |
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/featuretype/DefaultFeatureAttributePanel.java | ||
---|---|---|
2266 | 2266 |
DefaultFeatureAttributeSelectionPanel.class, |
2267 | 2267 |
null, |
2268 | 2268 |
LIBRARY_NAME, |
2269 |
new String[]{ "picker", "picker-datatype"} |
|
2269 |
new String[]{ "picker", "picker-datatype", "picker-datatype"}
|
|
2270 | 2270 |
); |
2271 | 2271 |
} |
2272 | 2272 |
|
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/featuretype/FeatureAttributeTreeCellRenderer.java | ||
---|---|---|
3 | 3 |
import java.awt.Component; |
4 | 4 |
import java.awt.FlowLayout; |
5 | 5 |
import javax.swing.Icon; |
6 |
import javax.swing.ImageIcon; |
|
6 | 7 |
import javax.swing.JLabel; |
7 | 8 |
import javax.swing.JPanel; |
8 | 9 |
import javax.swing.JTree; |
... | ... | |
10 | 11 |
import javax.swing.tree.DefaultTreeCellRenderer; |
11 | 12 |
import javax.swing.tree.TreeCellRenderer; |
12 | 13 |
import org.apache.commons.lang3.StringUtils; |
14 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
|
13 | 15 |
import org.gvsig.fmap.dal.swing.impl.featuretype.FeatureAttributeTreeModel.Node; |
14 | 16 |
import org.gvsig.tools.swing.api.CompoundIcon; |
15 | 17 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
... | ... | |
31 | 33 |
// private final JLabel icon; |
32 | 34 |
// private final DefaultTreeCellRenderer label; |
33 | 35 |
private final IconTheme iconTheme; |
36 |
private final ImageIcon iconColumnQueryCalculated; |
|
37 |
private final ImageIcon iconColumnTableCalculated; |
|
34 | 38 |
|
35 | 39 |
public FeatureAttributeTreeCellRenderer() { |
36 | 40 |
this.iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
37 | 41 |
this.iconTable = iconTheme.get("featurestore-table"); |
38 | 42 |
this.iconColumn = iconTheme.get("featurestore-column"); |
43 |
this.iconColumnTableCalculated = iconTheme.get("featurestore-calculated-column"); |
|
44 |
this.iconColumnQueryCalculated = iconTheme.get("featurestore-query-calculated-column"); |
|
39 | 45 |
this.iconForeingKey = iconTheme.get("featurestore-foreing-key"); |
40 | 46 |
|
41 | 47 |
// this.panel = new JPanel(); |
... | ... | |
56 | 62 |
return theLabel; |
57 | 63 |
} |
58 | 64 |
Node node = (Node) value; |
59 |
Icon iconElement = node.isRoot()? this.iconTable: leaf? this.iconColumn: this.iconForeingKey; |
|
65 |
FeatureAttributeDescriptor attrdesc = node.getValue(); |
|
66 |
Icon iconElement; |
|
67 |
if( node.isRoot() ) { |
|
68 |
iconElement = this.iconTable; |
|
69 |
} else if( attrdesc == null ) { |
|
70 |
iconElement = leaf? this.iconColumn: this.iconForeingKey; |
|
71 |
} else if( attrdesc.isForeingKey() ) { |
|
72 |
iconElement = this.iconForeingKey; |
|
73 |
} else if( attrdesc.isComputed() ) { |
|
74 |
iconElement = (attrdesc.getStore()==null)? this.iconColumnQueryCalculated: this.iconColumnTableCalculated; |
|
75 |
} else { |
|
76 |
iconElement = iconColumn; |
|
77 |
} |
|
78 |
// Icon iconElement = node.isRoot()? this.iconTable: leaf? this.iconColumn: this.iconForeingKey; |
|
60 | 79 |
Icon iconDataType = null; |
61 | 80 |
try { |
62 | 81 |
if( !node.isRoot() ) { |
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/featuretype/DefaultFeatureAttributesSelectionPanelView.java | ||
---|---|---|
178 | 178 |
jpanel1.setLayout(formlayout1); |
179 | 179 |
|
180 | 180 |
btnColumnDown.setActionCommand("..."); |
181 |
btnColumnDown.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featuretype/featuretype-column-down.png"));
|
|
181 |
btnColumnDown.setIcon(loadImage("common-arrow-down.png"));
|
|
182 | 182 |
btnColumnDown.setName("btnColumnDown"); |
183 | 183 |
EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2); |
184 | 184 |
btnColumnDown.setBorder(emptyborder1); |
185 | 185 |
jpanel1.add(btnColumnDown,cc.xy(8,1)); |
186 | 186 |
|
187 | 187 |
btnColumnUp.setActionCommand("..."); |
188 |
btnColumnUp.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featuretype/featuretype-column-up.png"));
|
|
188 |
btnColumnUp.setIcon(loadImage("common-arrow-up.png"));
|
|
189 | 189 |
btnColumnUp.setName("btnColumnUp"); |
190 | 190 |
EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2); |
191 | 191 |
btnColumnUp.setBorder(emptyborder2); |
... | ... | |
203 | 203 |
jpanel1.setLayout(formlayout1); |
204 | 204 |
|
205 | 205 |
btnColumnAdd.setActionCommand("..."); |
206 |
btnColumnAdd.setIcon(loadImage("src/main/resources/org/gvsig/fmap/dal/swing/impl/featuretype/featuretype-column-add-arrow.png")); |
|
206 |
btnColumnAdd.setIcon(loadImage("common-arrow-right.png")); |
Also available in: Unified diff