[MMBASE CVS] contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service OdtFileTransfer.java Parserfactory.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service
In directory 
james.mmbase.org:/tmp/cvs-serv25934/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service

Modified Files:
        OdtFileTransfer.java Parserfactory.java 
Log Message:
CMSC-907 - Better code: remove unused imports/vars, removed redundant else 
clause, better encapsulation


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service
See also: http://www.mmbase.org/jira/browse/CMSC-907


Index: OdtFileTransfer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service/OdtFileTransfer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- OdtFileTransfer.java        7 Jul 2008 20:52:35 -0000       1.1
+++ OdtFileTransfer.java        29 Jul 2008 17:23:43 -0000      1.2
@@ -40,7 +40,7 @@
             }
 
             ofh.getFirstHtml();
-            Map rowAndSavedImageMap = saveAllImageToCMSC(new 
FileInputStream(file), requestContext);
+            Map<String, String> rowAndSavedImageMap = saveAllImageToCMSC(new 
FileInputStream(file), requestContext);
             ch.change(middelFileLocation, styleMap, rowAndSavedImageMap);
             FileInputStream fileInputStream = new 
FileInputStream(middelFileLocation + ".html");
             InputStreamReader inputStramReader = new 
InputStreamReader(fileInputStream, "utf-8");
@@ -70,9 +70,9 @@
         return doc;
     }
 
-    public static Map saveAllImageToCMSC(InputStream fis, String 
requestContext) throws IOException {
+    public static Map<String, String> saveAllImageToCMSC(InputStream fis, 
String requestContext) throws IOException {
 
-        Map<String, String> rawImgeToSavedImgeMaping = new HashMap();
+        Map<String, String> rawImgeToSavedImgeMaping = new HashMap<String, 
String>();
 
         ZipInputStream zis = new ZipInputStream(fis);
         ZipEntry ze;


Index: Parserfactory.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/openofficeintegration/src/java/com/finalist/cmsc/openoffice/service/Parserfactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Parserfactory.java  7 Jul 2008 20:52:35 -0000       1.3
+++ Parserfactory.java  29 Jul 2008 17:23:43 -0000      1.4
@@ -20,7 +20,7 @@
         Set<String> tag = hs.keySet();
         Iterator<String> it = tag.iterator();
         while (it.hasNext()) {
-            style = it.next().toString();
+            style = it.next();
             Element theNewNode = doc.createElement(style);
             NewNode = theNewNode.cloneNode(true);
             NewNode.appendChild(node.cloneNode(true));
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs