/ - Diff - Application: gvSIG desktop - gvSIG

Revision 47739

         public MapContext createMapContext();
         public boolean registerLayer(
                 Class<? extends DataStore> dataStoreClass,
                 Class theClass, // DataStoreClass, DataParametersClass
                 Class<? extends FLayer> layerClass);
         /**

         private final Map<String, Map<Class<ILegend>,Class<ILegendWriter>>> legendWriters = new LinkedHashMap<>();
         private final Map<Class<? extends DataStore>,Class<? extends FLayer>> layerClassFromStoreClass = new HashMap<>();
         private final Map<Class,Class<? extends FLayer>> layerClassFromStoreClass = new HashMap<>();
         private final Map<String,String> iconLayers = new HashMap(); //  (Map<String storeProviderName, String iconName>)
-...
         @Override
         public boolean registerLayer(
             Class<? extends DataStore> dataStoreClass,
             Class theClass,
             Class<? extends FLayer> layerClass)
+        {
             this.layerClassFromStoreClass.put(dataStoreClass, layerClass);
             this.layerClassFromStoreClass.put(theClass, layerClass);
             return true;
+        }
         private Class<? extends FLayer> getLayerClassFromDataStoreClass(
                 Class<? extends DataStore> dataStoreClass) {
             Class<? extends FLayer> layerClass = this.layerClassFromStoreClass.get(dataStoreClass);
         private Class<? extends FLayer> getLayerClass(
                 Class keyClass) {
             Class<? extends FLayer> layerClass = this.layerClassFromStoreClass.get(keyClass);
             if( layerClass!=null ) {
                 return layerClass;
+            }
             for (Map.Entry<Class<? extends DataStore>, Class<? extends FLayer>> entry : layerClassFromStoreClass.entrySet()) {
                 Class<? extends DataStore>  currentDataStoreClass = entry.getKey();
             for (Map.Entry<Class, Class<? extends FLayer>> entry : layerClassFromStoreClass.entrySet()) {
                 Class  currentKeyClass = entry.getKey();
                 layerClass = entry.getValue();
                 if( currentDataStoreClass.isAssignableFrom(dataStoreClass) ) {
                 if( currentKeyClass.isAssignableFrom(keyClass) ) {
                     return layerClass;
+                }
+            }
-...
                     );
                     return this.createLayer(layerName, dataStore, parameters);
+                }
                 Class<? extends FLayer> layerClass = this.getLayerClassFromDataStoreClass(FeatureStore.class);
                 Class<? extends FLayer> layerClass = this.getLayerClass(FeatureStore.class);
                 if (layerClass == null) {
                     throw new CantRetrieveLayerByStoreException(layerName, FeatureStore.class.getName());
+                }
-...
+                    }
+                }
                 Class<? extends FLayer> layerClass = this.getLayerClassFromDataStoreClass(dataStore.getClass());
                 Class<? extends FLayer> layerClass = this.getLayerClass(dataStore.getParameters().getClass());
                 if (layerClass == null) {
                     throw new CantRetrieveLayerByStoreException(layerName, dataStore.getName());
                     layerClass = this.getLayerClass(dataStore.getProviderFactory().getClass());
                     if (layerClass == null) {
                         layerClass = this.getLayerClass(dataStore.getClass());
+                    }
                     if (layerClass == null) {
                         throw new CantRetrieveLayerByStoreException(layerName, dataStore.getName());
+                    }
+                }
                 FLayer layer;
                 try {

Also available in: Unified diff