Changeset 692

Timestamp:

03/05/10 13:30:58 (6 months ago)

Author:

fabman

Message:

tkts #166, #172, #173 WIP (99.9% dun)

Location:

trunk/src/com/calenco

Files:

• CalencoV2App.java (modified) (2 diffs)
• Content.java (modified) (1 diff)
• addon/AddOnsManager.java (modified) (2 diffs)
• resource/workspace/ContentResource.java (modified) (1 diff)
• resource/workspace/ContentStylesheetsResource.java (moved) (moved from trunk/src/com/calenco/resource/workspace/ContentStylesheetResource.java) (4 diffs)
• staticres/workspace-html.ftl (modified) (1 diff)

trunk/src/com/calenco/CalencoV2App.java

@@ -44 +44 @@
 import com.calenco.resource.workspace.ContentResource;
 import com.calenco.resource.workspace.ContentRevhistoryResource;
-import com.calenco.resource.workspace.ContentStylesheetResource;
+import com.calenco.resource.workspace.ContentStylesheetsResource;
 import com.calenco.resource.workspace.DepsTreeResource;
 import com.calenco.resource.workspace.LanguageResource;
@@ -126 +126 @@
         wrouter.attach("/{wksp}/content/{langOrFile}/revhistory", ContentRevhistoryResource.class);
         wrouter.attach("/{wksp}/content/{lang}/{file}/revhistory", ContentRevhistoryResource.class);
-        wrouter.attach("/{wksp}/content/{langOrFile}/stylesheets", ContentStylesheetResource.class);
-        wrouter.attach("/{wksp}/content/{lang}/{file}/stylesheets", ContentStylesheetResource.class);
+        wrouter.attach("/{wksp}/content/{langOrFile}/stylesheets", ContentStylesheetsResource.class);
+        wrouter.attach("/{wksp}/content/{lang}/{file}/stylesheets", ContentStylesheetsResource.class);
         wrouter.attach("/{wksp}/content", ContentResource.class);
         wrouter.attach("/{wksp}/content/{langOrFile}", ContentResource.class);

trunk/src/com/calenco/Content.java

@@ -48 +48 @@
 
     public String getFname() {
-        return fname;
+        return fname.startsWith("/") ? fname.substring(1) : fname; // NOI18N
     }
 

trunk/src/com/calenco/addon/AddOnsManager.java

@@ -146 +146 @@
      */
     public AddOn getAddOn(String type) {
+        if (type == null) {
+            return null;
+        }
         Class<AddOn> clazz = addons.get(type);
         if (clazz != null) {
@@ -189 +192 @@
      */
     public List<Toolchain> getToolchains(String type) {
+        List<Toolchain> result = new ArrayList<Toolchain>();
         AddOn addon = getAddOn(type);
         if (addon != null) {
-            return new ArrayList<Toolchain>(addon.getToolchains().values());
-        } else {
-            return null;
-        }
+            Map<String, Toolchain> toolChains = addon.getToolchains();
+            if (toolChains != null) {
+                result.addAll(toolChains.values());
+            }
+        }
+        return result;
     }
 

trunk/src/com/calenco/resource/workspace/ContentResource.java

@@ -1194 +1194 @@
                             Association hasToolchain = new Association(Association.HAS_TOOLCHAIN);
                             hasToolchain.setFrom(href);
-                            hasToolchain.setTo(xsltype.getTcName());
+                            hasToolchain.setTo(String.format("%s|%s", xsltype.getAddOnName(), xsltype.getTcName()));
                             adao.add(hasToolchain);
                         }

trunk/src/com/calenco/resource/workspace/ContentStylesheetsResource.java

@@ -26 +26 @@
 import com.calenco.Content;
 import com.calenco.Language;
-import com.calenco.addon.AddOn;
 import com.calenco.addon.AddOnsManager;
+import com.calenco.addon.Toolchain;
 import com.calenco.repository.ContentDAO;
 import com.calenco.repository.dao.AssociationDAO;
@@ -50 +50 @@
  * @author fabman
  */
-public class ContentStylesheetResource extends AbstractWorkspaceResource {
+public class ContentStylesheetsResource extends AbstractWorkspaceResource {
     String langOrFile = null;
     String lang = null;
@@ -89 +89 @@
                 AssociationDAO adao = new AssociationDAO(session, workspace);
                 String cco_xmlType = null;
+                List<Toolchain> toolchains = null;
                 try {
                     cco_xmlType = dao.getProperty(path, "cco_xmltype").getString(); // NOI18N
                 } catch (Exception ignored) {
                 }
-                AddOn addOn = null;
-                try {
-                    addOn = AddOnsManager.getInstance().getAddOn(cco_xmlType);
-                } catch (Exception ignoredToo) {
-                }
-                if (cco_xmlType != null && addOn != null) {
-                    Set<Association> xslAssocs = adao.findByKindTo(Association.HAS_TOOLCHAIN, addOn.getType());
-                    getLogger().info("*+*+*+*DBG: Got XSL assocs: " + xslAssocs);
-                    for (Association xslAssoc: xslAssocs) {
-                        Content xsl = dao.retrieve(xslAssoc.getFrom(), null);
-                        if (xsl != null) {
-                            stylesheets.add(xsl);
+                if (cco_xmlType != null) {
+                    AddOnsManager aom = AddOnsManager.getInstance();
+                    toolchains = aom.getToolchains(cco_xmlType);
+                    for (Toolchain toolchain: toolchains) {
+                        String to = String.format("%s|%s", aom.getAddOn(cco_xmlType).getType(), toolchain.getName());
+                        Set<Association> xslAssocs = adao.findByKindTo(Association.HAS_TOOLCHAIN, to);
+                        for (Association xslAssoc: xslAssocs) {
+                            Content xsl = dao.retrieve(xslAssoc.getFrom(), null);
+                            if (xsl != null) {
+                                stylesheets.add(xsl);
+                            }
                         }
                     }
                 }
                 JSONObject xsls = new JSONObject();
-                xsls.put("count", stylesheets.size() + 1); // NOI18N
                 xsls.put("identifier", "href"); // NOI18N
                 xsls.put("label", "name"); // NOI18N
                 JSONArray xsla = new JSONArray();
-                xsla.put(new JSONObject().put("name", "[ DEFAULT ]").put("href", "DEFAULT")); // NOI18N
+                if (cco_xmlType != null && toolchains != null && !toolchains.isEmpty()) {
+                    xsla.put(new JSONObject().put("name", "[ DEFAULT ]").put("href", "DEFAULT")); // NOI18N
+                }
                 for (Content stylesheet: stylesheets) {
                     JSONObject xsl = new JSONObject();
@@ -121 +122 @@
                 }
                 xsls.put("items", xsla); // NOI18N
+                xsls.put("count", xsla.length()); // NOI18N
                 return new JsonRepresentation(xsls);
             } else {

trunk/src/com/calenco/staticres/workspace-html.ftl

@@ -1574 +1574 @@
 
             function fillXsl(/* String */selId) {
-                var xslStore = new dojo.data.ItemFileReadStore({url: "/workspaces/${wksp}/stylesheets"});
+                var xslStore = new dojo.data.ItemFileReadStore({url: selectedFile + "/stylesheets"});
                 xslStore.fetch({
                     query: {}, start: 0, count: 1, onComplete: function(res) {