Revision 36113

View differences:

branches/v2_0_0_prep/build/projects/gvsig-standard/gvsig-standard-installer/src/main/installjammer/gvsig-standard-installer.mpi
15 15
{Yes}
16 16

  
17 17
BaseDir
18
{/home/cordin/projects/gvsig/svn/gvSIG-2.0-build/build/product}
18
{/home/paco/workspace/gvSIG_2.0_post2028/build/product}
19 19

  
20 20
BaseNativeLibsDir
21
{/home/cordin/.depman/}
21
{/home/paco/.depman/}
22 22

  
23 23
BuildFailureAction
24 24
{Fail (recommended)}
......
165 165
{Yes}
166 166

  
167 167
Lini386NativeLibsDir
168
{/home/cordin/.depman/lib}
168
{/home/paco/.depman/lib}
169 169

  
170 170
PackageDescription
171 171
{gvSIG is a geographic information system (GIS), that is, a desktop application designed for capturing, storing, handling, analyzing and deploying any kind of referenced geographic information in order to solve complex management and planning problems. gvSIG is known for having a user-friendly interface, being able to access the most common formats, both vector and raster ones. It features a wide range of tools for working with geographic-like information (query tools, layout creation, geoprocessing, networks, etc.), which turns gvSIG into the ideal tool for users working in the land realm.
......
1936 1936
File ::676F17E2-2CD4-D421-DD02-EB8D133C78C2 -type dir -name META-INF -parent 8442BC1C-7F51-B061-4539-60B3942C05F2
1937 1937
File ::E6682B45-2FAB-B50A-652A-1934CACA33BB -type dir -name services -parent 676F17E2-2CD4-D421-DD02-EB8D133C78C2
1938 1938
File ::D0C39F9D-6842-C436-13EF-2AA5CE4782C2 -name org.gvsig.tools.library.Library -parent E6682B45-2FAB-B50A-652A-1934CACA33BB
1939
File ::3BC8D5B9-38A9-4188-7619-2437E32E3691 -type dir -name org.gvsig.newlayer.app.extension -active 0 -parent 72746268-7243-EFA6-273F-FEE49F326114
1939 1940
File ::B9360381-0809-6F6E-1853-A77EEED4D00C -type dir -name install -active 0 -parent 1B718456-0AF4-8BDF-A1ED-E17D27781AD8
1940 1941
File ::962AB14B-CC18-C2BF-5E06-ACF38A62039A -name create-package-index.sh -parent B9360381-0809-6F6E-1853-A77EEED4D00C
1941 1942
File ::4789CDF1-8CF7-487C-7A37-8832C6BAFA7A -name gvSIG-desktop-2.0.0-org.gvsig.annotation.app.extension-1.0.0-SNAPSHOT-2024-devel-all-all-j1_5.gvspkg -parent B9360381-0809-6F6E-1853-A77EEED4D00C
branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/serverexplorer/filesystem/impl/DefaultFilesystemServerExplorer.java
19 19
import org.gvsig.fmap.dal.exception.InitializeException;
20 20
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
21 21
import org.gvsig.fmap.dal.exception.RemoveException;
22
import org.gvsig.fmap.dal.exception.ServerExplorerAddException;
22 23
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
23 24
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemFileFilter;
24 25
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorer;
......
188 189
			FilesystemServerExplorerProvider provider = this
189 190
					.getProvider(providerName);
190 191

  
192
			ndsp.validate();
191 193
			provider.create(ndsp, overwrite);
192 194
			return true; 
193 195
		} catch (DataException e) {
194
			throw new RemoveException(this.getProviderName(), e);
196
			throw new ServerExplorerAddException(this.getProviderName(), e);
197
		} catch (ValidateDataParametersException e) {
198
			throw new ServerExplorerAddException(this.getProviderName(), e);
195 199
		}
196 200
	}
197 201

  
branches/v2_0_0_prep/libraries/org.gvsig.newlayer/org.gvsig.newlayer.lib/org.gvsig.newlayer.lib.impl/src/main/java/org/gvsig/newlayer/impl/DefaultNewLayerWizard.java
7 7
import javax.swing.ImageIcon;
8 8
import javax.swing.JPanel;
9 9

  
10
import jwizardcomponent.CancelAction;
10 11
import jwizardcomponent.DefaultJWizardComponents;
11 12
import jwizardcomponent.FinishAction;
12 13
import jwizardcomponent.JWizardComponents;
......
17 18
import org.gvsig.newlayer.NewLayerService;
18 19
import org.gvsig.newlayer.NewLayerServiceException;
19 20
import org.gvsig.newlayer.NewLayerWizard;
20
import org.gvsig.newlayer.spi.AbstractNewLayerProvider;
21 21

  
22 22
public class DefaultNewLayerWizard extends NewLayerWizard {
23 23

  
......
32 32
		setPreferredSize(new Dimension(600,400));
33 33
		this.service = service;
34 34
		this.getWizardComponents().setFinishAction(new MyFinishAction(this.getWizardComponents()));
35
		this.getWizardComponents().setCancelAction(new MyCancelAction(this.getWizardComponents()));
35 36
		this.createTypeSelector();
36 37
	}
37 38

  
......
110 111

  
111 112
		public MyFinishAction(JWizardComponents arg0) {
112 113
			super(arg0);
113
			// TODO Auto-generated constructor stub
114 114
		}
115 115

  
116 116
		public void performAction() {
117
			//Comprobar storeName y storeParameters y pedirlos si no est?n 
117
			if (getService().getStoreName()==null){
118
				//TODO pedirlo
119
			}
120
			if (getService().getNewStoreParameters()==null){
121
				//TODO pedirlo
122
			}
118 123
			try {
119 124
				getService().createLayer();
120 125
			} catch (NewLayerServiceException e) {
......
124 129
		}
125 130

  
126 131
	}
132
	
133
	private class MyCancelAction extends CancelAction {
134
		
135
		public MyCancelAction(DefaultJWizardComponents wizardComponents) {
136
			super(wizardComponents);
137
		}
138

  
139
		public void performAction() {
140
			
141
		}
142
		
143
	}
127 144
}
branches/v2_0_0_prep/libraries/org.gvsig.newlayer/org.gvsig.newlayer.lib/org.gvsig.newlayer.lib.impl/pom.xml
124 124
            <artifactId>org.gvsig.i18n</artifactId>
125 125
            <scope>compile</scope>
126 126
        </dependency>
127
		        
127
         <dependency>
128
            <groupId>org.gvsig</groupId>
129
            <artifactId>org.gvsig.tools.swing.api</artifactId>
130
            <scope>compile</scope>
131
        </dependency>
132
          <dependency>
133
            <groupId>org.gvsig</groupId>
134
            <artifactId>org.gvsig.tools.swing.impl</artifactId>
135
            <scope>runtime</scope>
136
        </dependency>
128 137
	</dependencies>
129 138
	<properties>
130 139
        <build-dir>${basedir}/../../../build</build-dir>
branches/v2_0_0_prep/libraries/org.gvsig.newlayer/org.gvsig.newlayer.prov/org.gvsig.newlayer.prov.generic/src/main/java/org/gvsig/newlayer/prov/generic/NewLayerGenericProvider.java
39 39
import org.gvsig.newlayer.prov.generic.panels.SelectStoreTypePanel;
40 40
import org.gvsig.newlayer.prov.generic.panels.StoreParamsPanel;
41 41
import org.gvsig.newlayer.spi.AbstractNewLayerProvider;
42
import org.gvsig.tools.exception.BaseRuntimeException;
42 43
import org.slf4j.Logger;
43 44
import org.slf4j.LoggerFactory;
44 45

  
......
53 54
	List<NewLayerProviderPanel> panels = new ArrayList<NewLayerProviderPanel>();
54 55
	private String explorerName = null; 
55 56
	private DataServerExplorerParameters explorerParameters = null;
57
	private NewFeatureStoreParameters storeParameters = null;
56 58
	
57 59
    protected NewLayerGenericProvider(NewLayerService service) {
58 60
		super(service);
......
71 73
	}
72 74

  
73 75
	public NewFeatureStoreParameters getNewStoreParameters() {
76
		if (storeParameters != null){
77
			if (storeParameters.getDataStoreName().equals(this.getStoreName())){
78
				return storeParameters;
79
			}
80
		}
74 81
		DataManager dataManager = DALLocator.getDataManager();
75 82
		try {
76
			return (NewFeatureStoreParameters) dataManager.createNewStoreParameters(this.getExplorerName(), this.getStoreName());
83
			storeParameters = (NewFeatureStoreParameters) dataManager.createNewStoreParameters(this.getExplorerName(), this.getStoreName());
84
			return storeParameters;
77 85
		} catch (InitializeException e) {
78 86
			LOG.error("Can't initialize store parameters.");
79
			throw new RuntimeException("Can't initialize store parameters.");
87
			throw new CantInitializeStoreParametersException(e);
80 88
		} catch (ProviderNotRegisteredException e) {
81 89
			LOG.error("Can't create store parameters, provider not registered.");
82
			throw new RuntimeException("Can't create store parameters, provider not registered.");
90
			throw new CantCreateStoreParametersException(e);
83 91
		}
84 92
	}
85 93

  
94
	class CantCreateStoreParametersException extends BaseRuntimeException {
95
		/**
96
		 * 
97
		 */
98
		private static final long serialVersionUID = -3487961532247258393L;
99
		private final static String MESSAGE_FORMAT = "Can't create store parameters, provider not registered.";
100
		private final static String MESSAGE_KEY = "_Cant_create_store_parameters_provider_not_registered";
101

  
102
		public CantCreateStoreParametersException(Throwable cause) {
103
			super(MESSAGE_FORMAT, cause, MESSAGE_KEY, serialVersionUID);
104
		}
105
	}
106
	
107
	class CantInitializeStoreParametersException extends BaseRuntimeException {
108
		/**
109
		 * 
110
		 */
111
		private static final long serialVersionUID = -5263149018209261288L;
112
		private final static String MESSAGE_FORMAT = "Can't initialize store parameters.";
113
		private final static String MESSAGE_KEY = "_Cant_initialize_store_parameters";
114

  
115
		public CantInitializeStoreParametersException(Throwable cause) {
116
			super(MESSAGE_FORMAT, cause, MESSAGE_KEY, serialVersionUID);
117
		}
118
	}
119

  
120
	
86 121
	public List<NewLayerProviderPanel> getPanels() {
87 122
		return panels;
88 123
	}
branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/exception/ServerExplorerAddException.java
1
package org.gvsig.fmap.dal.exception;
2

  
3
public class ServerExplorerAddException extends DataException {
4

  
5
	/**
6
	 * 
7
	 */
8
	private static final long serialVersionUID = -6146358748129171538L;
9
	private final static String MESSAGE_FORMAT = "Exception creating '%(store)'.";
10
	private final static String MESSAGE_KEY = "_ServerExplorerAddException";
11

  
12
	public ServerExplorerAddException(String store, Throwable cause) {
13
		super(MESSAGE_FORMAT, cause, MESSAGE_KEY, serialVersionUID);
14
		setValue("store", store);
15
	}
16

  
17
}

Also available in: Unified diff