diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java @ 4504:d7e1aee9d51e

Merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 14 Nov 2012 12:37:57 +0100
parents a2735a4bf75e
children
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Wed Nov 14 12:36:30 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Wed Nov 14 12:37:57 2012 +0100
@@ -95,7 +95,7 @@
     private Map<String, StateData> data;
 
     /** Mapping of state names to created facets. */
-    protected Map<String, List<Facet>> facets;
+    private Map<String, List<Facet>> facets;
 
     /**
      * Used to generates "view" on the facets (hides facets not matching the
@@ -930,6 +930,8 @@
         }
 
         log.warn("Could not find facet: " + name + " at " + index);
+        log.warn("Available facets for : " + getName() + " " + identifier() +
+                ": " + facets.values());
         return null;
     }
 
@@ -1221,7 +1223,7 @@
 
         String stateId = state.getID();
 
-        List<Facet> fs = facets.get(stateId);
+        List<Facet> fs = getFacets(stateId);
 
         if (fs == null || fs.isEmpty()) {
             if (debug) {
@@ -1229,6 +1231,9 @@
             }
             return new ArrayList<Output>();
         }
+        if (debug) {
+            log.debug("State '" + stateId + "' has facets " + fs);
+        }
 
         List<Output> gen = generateOutputs(list, fs);
 
@@ -1249,10 +1254,13 @@
      */
     protected List<Output> generateOutputs(List<Output> list, List<Facet> fs) {
         List<Output> generated = new ArrayList<Output>();
+        log.debug("generateOutputs for Artifact " + getName() + " "
+                + identifier());
 
         boolean debug = log.isDebugEnabled();
 
         for (Output out: list) {
+            log.debug("check facets for output: " + out.getName());
             Output o = new DefaultOutput(
                 out.getName(),
                 out.getDescription(),
@@ -1439,6 +1447,9 @@
     protected void dumpArtifact() {
         log.debug("++++++++++++++ DUMP ARTIFACT DATA +++++++++++++++++");
         // Include uuid, type, name
+        log.debug(" - Name: " + getName());
+        log.debug(" - UUID: " + identifier());
+        log.debug(" - Class: " + this.getClass().getName());
 
         log.debug("------ DUMP DATA ------");
         Collection<StateData> allData = data.values();
@@ -1540,5 +1551,14 @@
 
         destroyStates(toDestroy, context);
     }
+
+    /**
+     * Return the Facets which a state provides
+     * @param stateid String that identifies the state
+     * @return List of Facets belonging to the state identifier
+     */
+    protected List<Facet> getFacets(String stateid) {
+        return this.facets.get(stateid);
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org