Revision 24984

View differences:

branches/v2_0_0_prep/applications/appgvSIG/src-test/com/iver/cit/gvsig/panelGroup/samples/Samples_ExtensionPointsOfIPanels.java
24 24
import org.gvsig.gui.beans.panelGroup.panels.AbstractPanel;
25 25
import org.gvsig.gui.beans.panelGroup.tabbedPanel.TabbedPanel;
26 26
import org.gvsig.gui.beans.panelGroup.treePanel.TreePanel;
27
import org.gvsig.tools.ToolsLocator;
28
import org.gvsig.tools.extensionpoint.ExtensionPoint;
29
import org.gvsig.tools.extensionpoint.ExtensionPointManager;
27 30

  
28 31
import com.iver.cit.gvsig.panelGroup.PanelGroupDialog;
29 32
import com.iver.cit.gvsig.panelGroup.loaders.PanelGroupLoaderFromExtensionPoint;
30
import com.iver.utiles.extensionPoints.ExtensionPoints;
31
import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
32 33

  
33 34
/**
34
 * <p>This class has information to create samples to test {@link PanelGroupManager PanelGroupManager},
35
 *  {@link TabbedPanel TabbedPanel}, {@link TreePanel TreePanel},
36
 *  {@link AbstractPanel AbstractPanel}, {@link PanelGroupLoaderUtilities PanelGroupLoaderUtilities},
37
 *  {@link PanelGroupLoaderFromList PanelGroupLoaderFromList}, {@link PanelGroupLoaderFromExtensionPoint PanelGroupLoaderFromExtensionPoint},
38
 *  and {@link PanelGroupDialog PanelGroupDialog}.</p>
35
 * <p>
36
 * This class has information to create samples to test
37
 * {@link PanelGroupManager PanelGroupManager}, {@link TabbedPanel TabbedPanel},
38
 * {@link TreePanel TreePanel}, {@link AbstractPanel AbstractPanel},
39
 * {@link PanelGroupLoaderUtilities PanelGroupLoaderUtilities},
40
 * {@link PanelGroupLoaderFromList PanelGroupLoaderFromList},
41
 * {@link PanelGroupLoaderFromExtensionPoint PanelGroupLoaderFromExtensionPoint}
42
 * , and {@link PanelGroupDialog PanelGroupDialog}.
43
 * </p>
39 44
 * 
40 45
 * @version 16/10/2007
41
 * @author Pablo Piqueras Bartolom? (pablo.piqueras@iver.es) 
46
 * @author Pablo Piqueras Bartolom? (pablo.piqueras@iver.es)
42 47
 */
43 48
public class Samples_ExtensionPointsOfIPanels {
44 49
	public final static String EXTENSIONPOINT1_NAME = "RasterLayerProperties";
......
54 59
	public final static String[] EXTENSIONPOINTS1_NAMES = {"Information", "Bands", "Transparency", "Enhanced", "PanSharpening", "Scale"};
55 60
	public final static String[] EXTENSIONPOINTS2_NAMES = {"Information", "Transparency", "Scale"};
56 61
	public final static String[] EXTENSIONPOINTS3_OTHER_NAMES = {"SamplePanelWithoutGroupLabel", "SamplePanelGroupLabelRepeated"};
57
	public final static String[] EXTENSIONPOINTS4_NAMES = {"SampleInitializingExcetionPanel", "SampleInfoPanel"}; // Test 'ListCouldntLoadPanelFromListException' with any 'Exception' 
62
	public final static String[] EXTENSIONPOINTS4_NAMES = {
63
			"SampleInitializingExcetionPanel", "SampleInfoPanel" }; // Test 'ListCouldntLoadPanelFromListException' with any 'Exception'
58 64
	public final static String[] EXTENSIONPOINTS5_NAMES = {"SampleInfoPanel", "SampleUndefinedPreferredSizeExceptionPanel"}; // Test 'ListCouldntAddPanelException' with a 'PanelWithNoPreferredSizeDefinedException'
59 65
	public final static String[] EXTENSIONPOINTS6_NAMES = {}; // Test 'ListCouldntAddPanelException' with a 'EmptyPanelGroupException'
60 66
	public final static String[] EXTENSIONPOINTS7_NAMES = {"SampleInvisiblePanel.class"}; // Test 'ListCouldntAddPanelException' with a 'EmptyPanelGroupGUIException'
......
64 70
	public final static Class[] EXTENSIONPOINTS1_CLASSES = {SampleInfoPanel.class, SampleBandSetupPanel.class, SampleTransparencyPanel.class, SampleEnhancedPanel.class, SamplePanSharpeningPanel.class, SampleScalePanel.class};
65 71
	public final static Class[] EXTENSIONPOINTS2_CLASSES = {SampleInfoPanel.class, SampleTransparencyPanel.class, SampleScalePanel.class};
66 72
	public final static Class[] OTHER_PANELS_EXTENSIONPOINTS3_CLASSES = {SamplePanelWithoutGroupLabel.class, SamplePanelGroupLabelRepeated.class};
67
	public final static Class[] EXTENSIONPOINTS4_CLASSES = {SampleInitializingExcetionPanel.class, SampleInfoPanel.class}; // Test 'ListCouldntLoadPanelFromListException' with any 'Exception' 
73
	public final static Class[] EXTENSIONPOINTS4_CLASSES = {
74
			SampleInitializingExcetionPanel.class, SampleInfoPanel.class }; // Test 'ListCouldntLoadPanelFromListException' with any 'Exception'
68 75
	public final static Class[] EXTENSIONPOINTS5_CLASSES = {SampleInfoPanel.class, SampleUndefinedPreferredSizeExceptionPanel.class}; // Test 'ListCouldntAddPanelException' with a 'PanelWithNoPreferredSizeDefinedException'
69 76
	public final static Class[] EXTENSIONPOINTS6_CLASSES = {}; // Test 'ListCouldntAddPanelException' with a 'EmptyPanelGroupException'
70 77
	public final static Class[] EXTENSIONPOINTS7_CLASSES = {SampleInvisiblePanel.class}; // Test 'ListCouldntAddPanelException' with a 'EmptyPanelGroupGUIException'
......
73 80
	public final static Class[] EXTENSIONPOINTS10_CLASSES = {SampleBandSetupPanel.class, SampleInvisiblePanel.class, SampleInitializingExcetionPanel.class, SampleUndefinedPreferredSizeExceptionPanel.class}; // Test 'ListCouldntAddPanelException' with a 'PanelWithNoPreferredSizeDefinedException', a EmptyPanelGroupGUIException and a 'ListCouldntLoadPanelFromListException' with any 'Exception'
74 81
	public final static Object REFERENCE1 = new String("Raster Layer");
75 82
	public final static Object REFERENCE2 = new String("Imaginary Layer");
76
	public final static Object REFERENCE3 = new String("Other tests");	
83
	public final static Object REFERENCE3 = new String("Other tests");
77 84
	public final static String REFERENCE1_NAME = "Raster Layer reference";
78 85
	public final static String REFERENCE2_NAME = "Imaginary Layer reference";
79 86
	public final static String REFERENCE3_NAME = "Other tests reference";
......
88 95
	public final static String[] PANELS3_LABELGROUPS = {null, "GroupLabelRepeated_LABELGROUP"};
89 96
	public final static short PANELS_DEFAULT_WIDTH = 500;
90 97
	public final static short PANELS_DEFAULT_HEIGHT = 400;
91
	
92
	private static ExtensionPoints extensionPoints = null;
93
	
98

  
99

  
94 100
	/**
95 101
	 * <p>Loads the information of the sample.</p>
96 102
	 */
97 103
	public static void loadSample() {
98
		if (extensionPoints == null) {
99
			extensionPoints = ExtensionPointsSingleton.getInstance();
100
	
101
			extensionPoints.add(EXTENSIONPOINT1_NAME, EXTENSIONPOINTS1_NAMES[0], EXTENSIONPOINTS1_CLASSES[0]);
102
			extensionPoints.add(EXTENSIONPOINT1_NAME, EXTENSIONPOINTS1_NAMES[1], EXTENSIONPOINTS1_CLASSES[1]);
103
			extensionPoints.add(EXTENSIONPOINT1_NAME, EXTENSIONPOINTS1_NAMES[2], EXTENSIONPOINTS1_CLASSES[2]);
104
			extensionPoints.add(EXTENSIONPOINT1_NAME, EXTENSIONPOINTS1_NAMES[3], EXTENSIONPOINTS1_CLASSES[3]);
105
			extensionPoints.add(EXTENSIONPOINT1_NAME, EXTENSIONPOINTS1_NAMES[4], EXTENSIONPOINTS1_CLASSES[4]);
106
			extensionPoints.add(EXTENSIONPOINT1_NAME, EXTENSIONPOINTS1_NAMES[5], EXTENSIONPOINTS1_CLASSES[5]);
104
			ExtensionPointManager epMan = ToolsLocator.getExtensionPointManager();
107 105

  
108
			extensionPoints.add(EXTENSIONPOINT2_NAME, EXTENSIONPOINTS2_NAMES[0], EXTENSIONPOINTS2_CLASSES[0]);
109
			extensionPoints.add(EXTENSIONPOINT2_NAME, EXTENSIONPOINTS2_NAMES[1], EXTENSIONPOINTS2_CLASSES[1]);
110
			extensionPoints.add(EXTENSIONPOINT2_NAME, EXTENSIONPOINTS2_NAMES[2], EXTENSIONPOINTS2_CLASSES[2]);
106
		ExtensionPoint ep = epMan.add(EXTENSIONPOINT1_NAME, "");
111 107

  
112
			extensionPoints.add(EXTENSIONPOINT3_NAME, EXTENSIONPOINTS3_OTHER_NAMES[0], OTHER_PANELS_EXTENSIONPOINTS3_CLASSES[0]);
113
			extensionPoints.add(EXTENSIONPOINT3_NAME, EXTENSIONPOINTS3_OTHER_NAMES[1], OTHER_PANELS_EXTENSIONPOINTS3_CLASSES[1]);
108
		ep.append(EXTENSIONPOINTS1_NAMES[0], "", EXTENSIONPOINTS1_CLASSES[0]);
109
		ep.append(EXTENSIONPOINTS1_NAMES[1], "", EXTENSIONPOINTS1_CLASSES[1]);
110
		ep.append(EXTENSIONPOINTS1_NAMES[2], "", EXTENSIONPOINTS1_CLASSES[2]);
111
		ep.append(EXTENSIONPOINTS1_NAMES[3], "", EXTENSIONPOINTS1_CLASSES[3]);
112
		ep.append(EXTENSIONPOINTS1_NAMES[4], "", EXTENSIONPOINTS1_CLASSES[4]);
113
		ep.append(EXTENSIONPOINTS1_NAMES[5], "", EXTENSIONPOINTS1_CLASSES[5]);
114 114

  
115
			extensionPoints.add(EXTENSIONPOINT4_NAME, EXTENSIONPOINTS4_NAMES[0], EXTENSIONPOINTS4_CLASSES[0]);
116
			extensionPoints.add(EXTENSIONPOINT4_NAME, EXTENSIONPOINTS4_NAMES[1], EXTENSIONPOINTS4_CLASSES[1]); 
115
		ep = epMan.add(EXTENSIONPOINT2_NAME, "");
116
		ep.append(EXTENSIONPOINTS2_NAMES[0], "", EXTENSIONPOINTS2_CLASSES[0]);
117
		ep.append(EXTENSIONPOINTS2_NAMES[1], "", EXTENSIONPOINTS2_CLASSES[1]);
118
		ep.append(EXTENSIONPOINTS2_NAMES[2], "", EXTENSIONPOINTS2_CLASSES[2]);
117 119

  
118
			extensionPoints.add(EXTENSIONPOINT5_NAME, EXTENSIONPOINTS5_NAMES[0], EXTENSIONPOINTS5_CLASSES[0]);
119
			extensionPoints.add(EXTENSIONPOINT5_NAME, EXTENSIONPOINTS5_NAMES[1], EXTENSIONPOINTS5_CLASSES[1]); 
120
		ep = epMan.add(EXTENSIONPOINT3_NAME, "");
121
		ep.append(EXTENSIONPOINTS3_OTHER_NAMES[0], "",
122
				OTHER_PANELS_EXTENSIONPOINTS3_CLASSES[0]);
123
		ep.append(EXTENSIONPOINTS3_OTHER_NAMES[1], "",
124
				OTHER_PANELS_EXTENSIONPOINTS3_CLASSES[1]);
120 125

  
121
			extensionPoints.add(EXTENSIONPOINT6_NAME, null, null);
126
		ep = epMan.add(EXTENSIONPOINT4_NAME, "");
127
		ep.append(EXTENSIONPOINTS4_NAMES[0], "", EXTENSIONPOINTS4_CLASSES[0]);
128
		ep.append(EXTENSIONPOINTS4_NAMES[1], "", EXTENSIONPOINTS4_CLASSES[1]);
122 129

  
123
			extensionPoints.add(EXTENSIONPOINT7_NAME, EXTENSIONPOINTS7_NAMES[0], EXTENSIONPOINTS7_CLASSES[0]);
130
		ep = epMan.add(EXTENSIONPOINT5_NAME, "");
131
		ep.append(EXTENSIONPOINTS5_NAMES[0], "", EXTENSIONPOINTS5_CLASSES[0]);
132
		ep.append(EXTENSIONPOINTS5_NAMES[1], "", EXTENSIONPOINTS5_CLASSES[1]);
124 133

  
125
			extensionPoints.add(EXTENSIONPOINT8_NAME, EXTENSIONPOINTS8_NAMES[0], EXTENSIONPOINTS8_CLASSES[0]);
126
			extensionPoints.add(EXTENSIONPOINT8_NAME, EXTENSIONPOINTS8_NAMES[1], EXTENSIONPOINTS8_CLASSES[1]); 
134
		epMan.add(EXTENSIONPOINT6_NAME, "");
127 135

  
128
			extensionPoints.add(EXTENSIONPOINT9_NAME, EXTENSIONPOINTS9_NAMES[0], EXTENSIONPOINTS9_CLASSES[0]);
129
			extensionPoints.add(EXTENSIONPOINT9_NAME, EXTENSIONPOINTS9_NAMES[1], EXTENSIONPOINTS9_CLASSES[1]);
130
			extensionPoints.add(EXTENSIONPOINT9_NAME, EXTENSIONPOINTS9_NAMES[2], EXTENSIONPOINTS9_CLASSES[2]);
136
		ep = epMan.add(EXTENSIONPOINT7_NAME, "");
137
		ep.append(EXTENSIONPOINTS7_NAMES[0], "", EXTENSIONPOINTS7_CLASSES[0]);
131 138

  
132
			extensionPoints.add(EXTENSIONPOINT10_NAME, EXTENSIONPOINTS10_NAMES[0], EXTENSIONPOINTS10_CLASSES[0]);
133
			extensionPoints.add(EXTENSIONPOINT10_NAME, EXTENSIONPOINTS10_NAMES[1], EXTENSIONPOINTS10_CLASSES[1]);
134
			extensionPoints.add(EXTENSIONPOINT10_NAME, EXTENSIONPOINTS10_NAMES[2], EXTENSIONPOINTS10_CLASSES[2]);
135
			extensionPoints.add(EXTENSIONPOINT10_NAME, EXTENSIONPOINTS10_NAMES[3], EXTENSIONPOINTS10_CLASSES[3]);
136
		}
139
		ep = epMan.add(EXTENSIONPOINT8_NAME, "");
140
		ep.append(EXTENSIONPOINTS8_NAMES[0], "", EXTENSIONPOINTS8_CLASSES[0]);
141
		ep.append(EXTENSIONPOINTS8_NAMES[1], "", EXTENSIONPOINTS8_CLASSES[1]);
142

  
143
		ep = epMan.add(EXTENSIONPOINT9_NAME, "");
144
		ep.append(EXTENSIONPOINTS9_NAMES[0], "", EXTENSIONPOINTS9_CLASSES[0]);
145
		ep.append(EXTENSIONPOINTS9_NAMES[1], "", EXTENSIONPOINTS9_CLASSES[1]);
146
		ep.append(EXTENSIONPOINTS9_NAMES[2], "", EXTENSIONPOINTS9_CLASSES[2]);
147

  
148
		ep = epMan.add(EXTENSIONPOINT10_NAME, "");
149
		ep.append(EXTENSIONPOINTS10_NAMES[0], "", EXTENSIONPOINTS10_CLASSES[0]);
150
		ep.append(EXTENSIONPOINTS10_NAMES[1], "", EXTENSIONPOINTS10_CLASSES[1]);
151
		ep.append(EXTENSIONPOINTS10_NAMES[2], "", EXTENSIONPOINTS10_CLASSES[2]);
152
		ep.append(EXTENSIONPOINTS10_NAMES[3], "", EXTENSIONPOINTS10_CLASSES[3]);
137 153
	}
138 154
}
branches/v2_0_0_prep/applications/appgvSIG/src/com/prodevelop/cit/gvsig/vectorialdb/wizard/TablesListItem.java
48 48
import javax.swing.JCheckBox;
49 49

  
50 50
import org.cresques.cts.IProjection;
51
import org.gvsig.fmap.dal.DataTypes;
51 52
import org.gvsig.fmap.dal.exception.ReadException;
52 53
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
53 54
import org.gvsig.fmap.dal.feature.FeatureType;
......
169 170
			while (iter.hasNext()) {
170 171
				DBAttributeDescriptor dbattr = (DBAttributeDescriptor) iter
171 172
						.next();
172
				if (dbattr.getDataType() == dbattr.TYPE_GEOMETRY) {
173
				if (dbattr.getDataType() == DataTypes.GEOMETRY) {
173 174
					auxGeo.add(dbattr.getName());
174 175
				}
175 176
//				 if (dbattr.isPrimaryKey()) {
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/AddLayer.java
41 41
import org.gvsig.fmap.mapcontext.layers.LayerFactory;
42 42
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
43 43
import org.gvsig.fmap.mapcontrol.MapControl;
44
import org.gvsig.tools.ToolsLocator;
44 45

  
45 46
import com.iver.andami.PluginServices;
46 47
import com.iver.andami.plugins.Extension;
......
51 52
import com.iver.cit.gvsig.project.documents.ProjectDocument;
52 53
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
53 54
import com.iver.cit.gvsig.project.documents.view.gui.IView;
54
import com.iver.utiles.extensionPoints.ExtensionPoints;
55
import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
56 55

  
57 56

  
58 57
/**
......
148 147
		dbf.postInitialize();
149 148
		shp.postInitialize();
150 149

  
151
		ExtensionPoints extensionPoints = ExtensionPointsSingleton.getInstance();
152
		extensionPoints.add("FileExtendingOpenDialog", "FileOpenVectorial", VectorialFileOpen.class);
150
		ToolsLocator.getExtensionPointManager().add("FileExtendingOpenDialog",
151
				"").append("FileOpenVectorial", "", VectorialFileOpen.class);
153 152
	}
154 153

  
155 154
	public static void checkProjection(FLayer lyr, ViewPort viewPort) {
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/IntializeApplicationExtension.java
20 20
import com.iver.andami.PluginServices;
21 21
import com.iver.andami.plugins.Extension;
22 22
import com.iver.cit.gvsig.vectorialdb.DBResourceManager;
23
import com.iver.utiles.extensionPoints.ExtensionPoints;
24
import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
25 23

  
26 24
public class IntializeApplicationExtension extends Extension {
27
	private ExtensionPoints extensionPoints =
28
		ExtensionPointsSingleton.getInstance();
29 25
	private static Logger logger = Logger.getLogger("gvSIG");
30 26
	private Observer dbPasswordResorceObserver;
31 27
	public void initialize() {
......
135 131
		StringWriter writer = new StringWriter();
136 132
		String andamiPath;
137 133
		String extensionsPath;
138
		String jaiVersion;
134
		//		String jaiVersion;
139 135

  
140 136
		Properties props = System.getProperties();
141 137

  

Also available in: Unified diff