diff options
Diffstat (limited to 'xmerge')
81 files changed, 309 insertions, 548 deletions
diff --git a/xmerge/inc/pch/precompiled_xmerge.cxx b/xmerge/inc/pch/precompiled_xmerge.cxx index a3c5d7a24808..9cd60aa39f1e 100644 --- a/xmerge/inc/pch/precompiled_xmerge.cxx +++ b/xmerge/inc/pch/precompiled_xmerge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_xmerge.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/inc/pch/precompiled_xmerge.hxx b/xmerge/inc/pch/precompiled_xmerge.hxx index 33202852ae8d..acf651d06e65 100644 --- a/xmerge/inc/pch/precompiled_xmerge.hxx +++ b/xmerge/inc/pch/precompiled_xmerge.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeFactory.cpp b/xmerge/source/activesync/XMergeFactory.cpp index 1c59cd79a8a0..024771d1e011 100644 --- a/xmerge/source/activesync/XMergeFactory.cpp +++ b/xmerge/source/activesync/XMergeFactory.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // XMergeFactory.cpp: implementation of the CXMergeFactory class. // ////////////////////////////////////////////////////////////////////// @@ -88,3 +89,4 @@ STDMETHODIMP CXMergeFactory::LockServer(BOOL fLock) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeFactory.h b/xmerge/source/activesync/XMergeFactory.h index bb24e8aab14e..23a772b974c6 100644 --- a/xmerge/source/activesync/XMergeFactory.h +++ b/xmerge/source/activesync/XMergeFactory.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // XMergeFactory.h: interface for the CXMergeFactory class. // ////////////////////////////////////////////////////////////////////// @@ -32,3 +33,5 @@ public: }; #endif // !defined(AFX_XMERGEFACTORY_H__3150043C_57FB_4BC8_9104_379506FA6B9F__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeFilter.cpp b/xmerge/source/activesync/XMergeFilter.cpp index a02f11d03ad3..e56049f7f836 100644 --- a/xmerge/source/activesync/XMergeFilter.cpp +++ b/xmerge/source/activesync/XMergeFilter.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // XMergeFilter.cpp: implementation of the CXMergeFilter class. // ////////////////////////////////////////////////////////////////////// @@ -359,18 +360,6 @@ TCHAR* CXMergeFilter::GetJavaBaseDir() /* use current version */ lRet = ::RegQueryValueEx(hKey, _T("CurrentVersion"), 0, NULL, (LPBYTE)szCurrentJava, &dwSize); - /* - for (DWORD i = 0; lRet != ERROR_NO_MORE_ITEMS; i++) - { - lRet = ::RegEnumKeyEx(hKey, i, szKeyName, &dwKeyName, 0, szClassName, &dwClassName, NULL); - if(!strncmp(szKeyName, "1.4", 3)) - break; - dwKeyName = _MAX_PATH; - } - // Found a Java 1.4 installation. Can now read its home directory. - */ - - lRet = ::RegOpenKeyEx(hKey, _T(szCurrentJava), 0, KEY_READ, &hDataKey); if (lRet != ERROR_SUCCESS) { @@ -493,3 +482,5 @@ TCHAR* CXMergeFilter::GetXMergeClassPath() // Return the data return _strdup(clsPath.c_str()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeFilter.h b/xmerge/source/activesync/XMergeFilter.h index 54128f325125..c087a7a360e3 100644 --- a/xmerge/source/activesync/XMergeFilter.h +++ b/xmerge/source/activesync/XMergeFilter.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // XMergeFilter.h: interface for the CXMergeFilter class. // ////////////////////////////////////////////////////////////////////// @@ -71,3 +72,5 @@ public: }; #endif // !defined(AFX_XMERGEFILTER_H__25C39F6B_A1D7_408E_8F58_9CBEE9A666CC__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp index 469c15b2f292..3edc4c94a0e7 100644 --- a/xmerge/source/activesync/XMergeSync.cpp +++ b/xmerge/source/activesync/XMergeSync.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "stdafx.h" @@ -830,8 +831,9 @@ long CXMergeSyncModule::LockServer(BOOL fLock) return ::InterlockedDecrement(&m_lLocks); } -long CXMergeSyncModule::GetLockCount() +long CXMergeSyncModule::GetLockCount() const { return m_lLocks + m_lObjs; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeSync.h b/xmerge/source/activesync/XMergeSync.h index 4242b755c1fa..f50167e1f833 100644 --- a/xmerge/source/activesync/XMergeSync.h +++ b/xmerge/source/activesync/XMergeSync.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // XMergeSyncModule.h: interface for the CXMergeSyncModule class. // ////////////////////////////////////////////////////////////////////// @@ -19,7 +20,7 @@ protected: long m_lObjs; public: - long GetLockCount(); + long GetLockCount() const; long LockServer(BOOL fLock); HINSTANCE m_hInst; CXMergeSyncModule(); @@ -27,3 +28,5 @@ public: }; #endif // !defined(AFX_XMERGESYNCMODULE_H__0788DA0C_4DCB_4876_9722_F9EAF1EB5462__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/XMergeSync.rc b/xmerge/source/activesync/XMergeSync.rc index b355bcad7adc..3e9d24dd9207 100644 --- a/xmerge/source/activesync/XMergeSync.rc +++ b/xmerge/source/activesync/XMergeSync.rc @@ -2,20 +2,6 @@ // #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -<<<<<<< XMergeSync.rc -// #include "afxres.h" -======= -//#include "afxres.h" ->>>>>>> 1.1.12.1 - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - ///////////////////////////////////////////////////////////////////////////// // English (Ireland) resources diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk index 18d904f5e158..275dcd333ddb 100644 --- a/xmerge/source/activesync/makefile.mk +++ b/xmerge/source/activesync/makefile.mk @@ -27,7 +27,6 @@ PRJ = ..$/.. PRJNAME = xmerge -#PACKAGE = com$/sun$/star$/documentconversion$/XSLTFilter TARGET = xmergesync ENABLE_EXCEPTIONS=TRUE LIBTARGET=NO diff --git a/xmerge/source/activesync/resource.h b/xmerge/source/activesync/resource.h index c670835a7455..2e6600d64020 100644 --- a/xmerge/source/activesync/resource.h +++ b/xmerge/source/activesync/resource.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by XMergeSync.rc @@ -15,3 +16,5 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/stdafx.cpp b/xmerge/source/activesync/stdafx.cpp index eefe5176aad4..65cdc8840ca6 100644 --- a/xmerge/source/activesync/stdafx.cpp +++ b/xmerge/source/activesync/stdafx.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // // stdafx.cpp : source file that includes just the standard includes // stdafx.pch will be the pre-compiled header @@ -5,3 +6,4 @@ // #include "stdafx.h" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/stdafx.h b/xmerge/source/activesync/stdafx.h index 26faa277a87c..4e9680571f1c 100644 --- a/xmerge/source/activesync/stdafx.h +++ b/xmerge/source/activesync/stdafx.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, @@ -26,3 +27,4 @@ // extern CXMergeSyncModule _Module; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/bridge/build.xml b/xmerge/source/bridge/build.xml index ad0aa33d0f0f..5a2a2255cd52 100644 --- a/xmerge/source/bridge/build.xml +++ b/xmerge/source/bridge/build.xml @@ -43,9 +43,6 @@ <target name="init" > <mkdir dir="${target.dir}"/> - <echo message="--------------------------------------------------------------------------------" /> - <echo message="debug is ${debug}"/> - <echo message="--------------------------------------------------------------------------------" /> </target> <!-- compile java sources in ${package} --> diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index c2dafd75c996..9bcd469544eb 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -92,11 +92,8 @@ public class XMergeBridge { private static String sFileName=null; private static String sURL=""; - //private static FileOutputStream adaptedStream =null; - /** This inner class provides the component as a concrete implementation * of the service description. It implements the needed interfaces. - * @implements XTypeProvider */ static public class _XMergeBridge implements XImportFilter, @@ -160,16 +157,7 @@ public class XMergeBridge { public boolean importer(com.sun.star.beans.PropertyValue[] aSourceData, com.sun.star.xml.sax.XDocumentHandler xDocHandler, java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException { - /* - System.out.println("\nFound the Importer!\n"); - - System.out.println("\n"+msUserData[0]); - System.out.println("\n"+msUserData[1]); - System.out.println("\n"+msUserData[2]); - System.out.println("\n"+msUserData[3]); - System.out.println("\n"+msUserData[4]); - System.out.println("\n"+msUserData[5]); - */ + sFileName=""; sURL=""; String sDirectory = null; @@ -185,10 +173,7 @@ public class XMergeBridge { for (int i = 0 ; i < pValue.length; i++) { - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value; - try{ - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value); if (pValue[i].Name.compareTo("InputStream")==0){ xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new Type(com.sun.star.io.XInputStream.class), pValue[i].Value); } @@ -243,11 +228,9 @@ public class XMergeBridge { } catch (IOException e){ - //System.out.println("XMergeBridge IO Exception "+e.getMessage()); return false; } catch (Exception e){ - //System.out.println("XMergeBridge Exception "+e+" "+e.getMessage()); return false; } return true; @@ -256,16 +239,6 @@ public class XMergeBridge { public boolean exporter(com.sun.star.beans.PropertyValue[] aSourceData, java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException{ - /* - System.out.println("\nFound the Exporter!\n"); - - System.out.println("\n"+msUserData[0]); - System.out.println("\n"+msUserData[1]); - System.out.println("\n"+msUserData[2]); - System.out.println("\n"+msUserData[3]); - System.out.println("\n"+msUserData[4]); - System.out.println("\n"+msUserData[5]); - */ sFileName=null; sURL=null; String sDirectory = null; @@ -281,28 +254,22 @@ public class XMergeBridge { for (int i = 0 ; i < pValue.length; i++) { - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value); - try{ - //System.out.println("\n"+pValue[i].Name+" "+pValue[i].Value); if (pValue[i].Name.compareTo("OutputStream")==0){ xos=(com.sun.star.io.XOutputStream)AnyConverter.toObject(new Type(com.sun.star.io.XOutputStream.class), pValue[i].Value); - // System.out.println(pValue[i].Name+" "+xos); } + if (pValue[i].Name.compareTo("FileName")==0){ sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); - //System.out.println(pValue[i].Name+" "+sFileName); } + if (pValue[i].Name.compareTo("URL")==0){ sURL=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); - // System.out.println("\nMediaDescriptor url "+pValue[i].Name+" "+sURL); - } - if (pValue[i].Name.compareTo("Title")==0){ + if (pValue[i].Name.compareTo("Title")==0){ title=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value); - //System.out.println(pValue[i].Name+" "+title); } } catch(com.sun.star.lang.IllegalArgumentException AnyExec){ @@ -379,7 +346,6 @@ public class XMergeBridge { public void startDocument () { - //System.out.println("\nStart Document!"); } public void endDocument()throws com.sun.star.uno.RuntimeException @@ -391,12 +357,10 @@ public class XMergeBridge { } catch (IOException e){ - //System.out.println("Exception "+e); throw new com.sun.star.uno.RuntimeException(e.getMessage()); } catch (Exception e){ - //System.out.println("Exception "+e); throw new com.sun.star.uno.RuntimeException("Xmerge Exception"); } @@ -421,7 +385,7 @@ public class XMergeBridge { } } str=str.concat(">"); - // System.out.println(str); + try{ xOutStream.writeBytes(str.getBytes("UTF-8")); } @@ -534,12 +498,10 @@ public class XMergeBridge { int i=1; while (docEnum.hasMoreElements() && sURL.startsWith("file:")) { - //URI uri=new URI(sFileName); + URI uri=new URI(sURL); String newFileName= getPath(uri); - - //System.out.println("\nURI: "+uri.getPath()); File newFile=null; if (newFileName.lastIndexOf(".")!=-1){ newFile =new File(newFileName.substring(0,newFileName.lastIndexOf("."))+String.valueOf(i)+newFileName.substring(newFileName.lastIndexOf("."))); @@ -583,27 +545,15 @@ public class XMergeBridge { } else { - /* - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - byte[][] buf = new byte[1][4096]; - int n=0; - while ((n=xml.readSomeBytes(buf, 4096))>0) - bout.write(buf[0], 0, n); - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - cv.addInputStream(name, bin, false); - */ + cv.addInputStream(name,(InputStream)xis,false); - //System.out.println("\nConverting"); ConvertData dataIn = cv.convert(); - //System.out.println("\nFinished Converting"); Enumeration docEnum = dataIn.getDocumentEnumeration(); while (docEnum.hasMoreElements()) { OfficeDocument docIn = (OfficeDocument)docEnum.nextElement(); docIn.write(newxos,false); } - //newxos.write(-1); //EOF character - //newxos.flush(); newxos.close(); } ConverterInfoMgr.removeByJar(jarName); @@ -631,12 +581,6 @@ public class XMergeBridge { return path; } - - - - - - // Implement methods from interface XTypeProvider public byte[] getImplementationId() { byte[] byteReturn = {}; diff --git a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java index 37768fa4fb02..cd872329b596 100644 --- a/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java +++ b/xmerge/source/minicalc/java/org/openoffice/xmerge/converter/xml/sxc/minicalc/MinicalcDecoder.java @@ -111,8 +111,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder { Debug.log(Debug.ERROR, "MinicalcDecoder.constructor:" + e.getMessage()); throw new IOException(e.getMessage()); - // e.printStackTrace(); - } } @@ -237,8 +235,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder { Debug.log(Debug.ERROR, "MinicalcDecoder.setWorksheet:" + e.getMessage()); throw new IOException(e.getMessage()); - // e.printStackTrace(); - } } @@ -286,8 +282,6 @@ final class MinicalcDecoder extends SpreadsheetDecoder { Debug.log(Debug.ERROR, "MinicalcDecoder.goToNextCell:" + e.getMessage()); throw new IOException(e.getMessage()); - // e.printStackTrace(); - } return gotCell; diff --git a/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java b/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java index da01306d9545..617f60b1a152 100644 --- a/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java +++ b/xmerge/source/palmtests/qa/comparator/SimplePdbCompare.java @@ -25,12 +25,6 @@ * ************************************************************************/ -/* - * SimplePdbCompare.java - * - * Created on September 21, 2001, 10:23 AM - */ - /** * * @author mh101528 @@ -80,13 +74,11 @@ public final class SimplePdbCompare { if (pdb1.equals(pdb2)) { - //writeToLog("PDB " + pdbname1 + " and PDB " + pdbname2 + " are equal"); System.out.println("PDB " + pdbname1 + " and PDB " + pdbname2 + " are equal"); return true; } else { - //writeToLog("PDB " + pdbname1 + " and PDB " + pdbname2 + " are not equal"); System.out.println("PDB " + pdbname1 + " and PDB " + pdbname2 + " are not equal"); return false; } diff --git a/xmerge/source/palmtests/qa/comparator/XmlDiff.properties b/xmerge/source/palmtests/qa/comparator/XmlDiff.properties index 2fdff0953ed6..aa6e67772ef6 100644 --- a/xmerge/source/palmtests/qa/comparator/XmlDiff.properties +++ b/xmerge/source/palmtests/qa/comparator/XmlDiff.properties @@ -1,6 +1,4 @@ # -# $Id: XmlDiff.properties,v 1.2 2005-10-24 16:13:45 hr Exp $ -# # This properties file provides info for XmlDiff program # XmlDiff.file1 is the first input XML file # XmlDiff.file2 is the second input XML file diff --git a/xmerge/source/palmtests/qa/comparator/XmlWrapper.java b/xmerge/source/palmtests/qa/comparator/XmlWrapper.java index 16dddcb0a4f3..9502e61c2933 100644 --- a/xmerge/source/palmtests/qa/comparator/XmlWrapper.java +++ b/xmerge/source/palmtests/qa/comparator/XmlWrapper.java @@ -36,9 +36,7 @@ public class XmlWrapper System.out.println("args.length is " + args.length); if (args.length < 2) { System.out.println("Usage: java XmlWrapper [<zipfile1> <zipfile2>]."); - //return; System.exit(-1); - } XmlWrapper w = new XmlWrapper(); @@ -47,7 +45,6 @@ public class XmlWrapper currdirfp = new File("."); } catch (Exception fx) { System.out.println("Could not get File instance for current directory \n"); - //return; System.exit(-1); } @@ -60,7 +57,6 @@ public class XmlWrapper } catch (Exception tx) { System.out.println("Could not create TempFile "); System.out.println("Exception: " + tx.toString()); - //return; System.exit(-1); } @@ -76,14 +72,12 @@ public class XmlWrapper System.out.println("Exception: file is not a ZIP file: " + args[0]); f1.delete(); f2.delete(); - //return; System.exit(-1); } catch (Exception e) { System.out.println("Exception: Could not extract XML from " + args[0]); System.out.println("Exception: " + e.toString()); f1.delete(); f2.delete(); - //return; System.exit(-1); } @@ -96,7 +90,6 @@ public class XmlWrapper System.out.println("Exception: file is not a ZIP file: " + args[0]); f1.delete(); f2.delete(); - //return; System.exit(-1); } catch (Exception ex) { System.out.println(ex.getMessage()); @@ -104,7 +97,6 @@ public class XmlWrapper System.out.println("Exception: " + ex.toString()); f1.delete(); f2.delete(); - //return; System.exit(-1); } @@ -126,7 +118,6 @@ public class XmlWrapper System.out.println("Exception: " + ex.toString()); f1.delete(); f2.delete(); - //return; System.exit(-1); } diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java index df45b708d89c..28c7b627cf59 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java @@ -49,8 +49,7 @@ public class BeginningOfFile implements BIFFRecord { /** * Constructor that initializes the member values. * - * @param ver Version Number - * Substream type (workbook = 0x05, worksheet = 0x10) + * @param global True for a workbook, false for a worksheet */ public BeginningOfFile(boolean global) { setVersion((short) 271); @@ -58,7 +57,6 @@ public class BeginningOfFile implements BIFFRecord { setSubStreamWBGlobal(); else setSubStreamWorkSheet(); - // this.subStream = EndianConverter.writeShort(dt); } public BeginningOfFile(InputStream is) throws IOException { @@ -74,12 +72,10 @@ public class BeginningOfFile implements BIFFRecord { } private void setSubStreamWBGlobal() { - // subStream = new byte[] {0x05}; subStream = EndianConverter.writeShort((short) 0x05); } private void setSubStreamWorkSheet() { - // subStream = new byte[] {0x10}; subStream = EndianConverter.writeShort((short) 0x10); } diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java index da826a8d9058..3ce6b6535e9a 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java @@ -52,10 +52,9 @@ public class BlankCell extends CellValue { /** * Constructs a <code>BlankCell</code> using specified attributes * - * @param row row number - * @param col column number - * @param cellContents contents of the cell - * @param ixfe font index + * @param row row number + * @param column column number + * @param ixfe font index */ public BlankCell(int row, int column, int ixfe) throws IOException { @@ -87,7 +86,7 @@ public class BlankCell extends CellValue { /** * Reads a BlankCell <code>InputStream</code> * - * @param is InputStream containing a BlankCell. + * @param input InputStream containing a BlankCell. */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java index 9a370ccd8a59..d617837a5724 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java @@ -31,7 +31,6 @@ import java.io.OutputStream; import java.io.InputStream; import java.io.IOException; - import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; @@ -46,11 +45,11 @@ public class BoolErrCell extends CellValue { /** * Constructs a BoolErrCell from arguments * - * @param row row number - * @param col column number - * @param ixfe font index + * @param row row number + * @param column column number + * @param ixfe font index * @param bBoolErr Boolean value or error value - * @param fError Boolean error flag + * @param fError Boolean error flag */ public BoolErrCell(int row, int column, int ixfe, int bBoolErr, int fError) throws IOException { @@ -82,7 +81,7 @@ public class BoolErrCell extends CellValue { /** * Writes a <code>BoolErrCell</code> to the specified <code>Outputstream</code> * - * @param os the <code>OutputStream</code> to write to + * @param output the <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { @@ -99,7 +98,7 @@ public class BoolErrCell extends CellValue { /** * Reads a BoolErrCell from the <code>InputStream</code> * - * @param is InputStream containing a BoolErrCell + * @param input InputStream containing a BoolErrCell */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java index 679224634bfa..0d2cc0669c6c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java @@ -99,7 +99,7 @@ public class BoundSheet implements BIFFRecord { /** * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code> * - * @param ouput the <code>OutputStream</code> + * @param output the <code>OutputStream</code> */ public void write(OutputStream output) throws IOException { @@ -115,7 +115,7 @@ public class BoundSheet implements BIFFRecord { * Reads a BoundSheet from the <code>InputStream</code> The byte array * must be twice the size of the String as it uses unicode. * - * @param is InputStream containing the record data + * @param input InputStream containing the record data */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java index c09cde5a32c1..1aa6da472ccb 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java @@ -40,7 +40,7 @@ public abstract class CellValue implements BIFFRecord { protected byte col; protected byte[] ixfe = new byte[2]; - /** + /** * Get the row number of this cell * * @return the row number of this cell @@ -85,9 +85,9 @@ public abstract class CellValue implements BIFFRecord { } /** - * Set the row number of this cell + * Set the column number of this cell * - * @param col sets the row number for this cell + * @param col sets the column number for this cell */ public void setCol(int col) { this.col = (byte) (col - 1); // The cols start at 1 @@ -96,7 +96,7 @@ public abstract class CellValue implements BIFFRecord { /** * Writes basic cell value attributes to the specified <code>Outputstream</code> * - * @param os the <code>OutputStream</code> to write to + * @param output the <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { @@ -106,9 +106,9 @@ public abstract class CellValue implements BIFFRecord { } /** - * Writes a<code>LabelCell</code> to the specified <code>Outputstream</code> + * Reads a <code>LabelCell</code> from the specified <code>Inputstream</code> * - * @param os the <code>OutputStream</code> to write to + * @param input the <code>InputStream</code> to read from */ public int read(InputStream input) throws IOException { @@ -124,7 +124,6 @@ public abstract class CellValue implements BIFFRecord { return numOfBytesRead; } - /** * Returns the contents of the cell as a String * @@ -133,4 +132,3 @@ public abstract class CellValue implements BIFFRecord { abstract public String getString() throws IOException; } - diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java index 91186fa27c3c..9211bfb8e2bf 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CodePage.java @@ -79,7 +79,6 @@ public class CodePage implements BIFFRecord { int numOfBytesRead = input.read(codepage); numOfBytesRead += input.read(unknown1); numOfBytesRead += input.read(unknown2); - // numOfBytesRead += input.read(unknown3); unknown3 = (byte) input.read(); numOfBytesRead++; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java index 6ce59c7ca72c..14426241419c 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java @@ -54,8 +54,8 @@ public class ColInfo implements BIFFRecord { * * @param colFirst the first column this formatting applies to * @param colLast last column this formatting applies to - * @param coldx column width - * @param grbit options flags + * @param colDX column width + * @param ixfe index for formatting */ public ColInfo(int colFirst, int colLast, int colDX, int ixfe) { this.colFirst = EndianConverter.writeShort((short)colFirst); @@ -119,18 +119,18 @@ public class ColInfo implements BIFFRecord { } /** - * Get the hex code for this particular <code>BIFFRecord</code> + * Get the first column that this formatting applies to. * - * @return the hex code for <code>ColInfo</code> + * @return The first column. */ public short getFirst() { return EndianConverter.readShort(colFirst); } /** - * Get the hex code for this particular <code>BIFFRecord</code> + * Get the last column that this formatting applies to. * - * @return the hex code for <code>ColInfo</code> + * @return The last column. */ public short getLast() { return EndianConverter.readShort(colLast); @@ -139,7 +139,7 @@ public class ColInfo implements BIFFRecord { /** * Writes a ColInfo to the specified <code>Outputstream</code> * - * @param os the <code>OutputStream</code> to write to + * @param output the <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java index b3e3a8e6b0e3..b6b3baace2de 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java @@ -44,18 +44,21 @@ public class DefColWidth implements BIFFRecord { private byte[] coldx = new byte[2]; private byte[] ixfe = new byte[2]; -/** - * Constructs a pocket Excel Document from the - * <code>InputStream</code> and assigns it the document name passed in - * - * @param is InputStream containing a Pocket Excel Data file. - */ + /** + * Default constructor. Sets width to 9. + */ public DefColWidth() { grbit = new byte[] {0x00, 0x00}; coldx = new byte[] {0x00, 0x09}; ixfe = new byte[] {0x00, 0x00}; } + /** + * Constructs a pocket Excel Document from the + * <code>InputStream</code> and assigns it the document name passed in + * + * @param is InputStream containing a Pocket Excel Data file. + */ public DefColWidth(InputStream is) throws IOException { read(is); } diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java index 454a5ed87520..f2c5e83bc0e6 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java @@ -44,10 +44,7 @@ public class DefRowHeight implements BIFFRecord { private byte[] unknown2 = new byte[2]; /** - * Constructs a pocket Excel Document from the - * <code>InputStream</code> and assigns it the document name passed in - * - * @param is InputStream containing a Pocket Excel Data file. + * Default constructor. Sets something unknown to 255. */ public DefRowHeight() { unknown1 = new byte[] {(byte)0x00, (byte)0x00}; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java index 0f8c535a9b92..af97015db745 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java @@ -55,9 +55,10 @@ public class DefinedName implements BIFFRecord { private Workbook wb; /** - * Constructs a Defined Name from the <code>InputStream</code> + * Constructs a Defined Name from an existing <code>NameDefinition</code> * - * @param is InputStream containing the record data + * @param nd The name definition. + * @param wb The workbook we are defined in. */ public DefinedName(NameDefinition nd, Workbook wb) throws IOException { @@ -74,10 +75,12 @@ public class DefinedName implements BIFFRecord { grbit = EndianConverter.writeShort((short)0); ixals[0] = (byte)0xFF;ixals[1] = (byte)0xFF; } + /** * Constructs a Defined Name from the <code>InputStream</code> * * @param is InputStream containing the record data + * @param wb The workbook we are defined in. */ public DefinedName(InputStream is, Workbook wb) throws IOException { @@ -99,7 +102,7 @@ public class DefinedName implements BIFFRecord { * Reads a Defined Name from the <code>InputStream</code> The byte array * must be twice the size of the String as it uses unicode. * - * @param is InputStream containing the record data + * @param input InputStream containing the record data */ public int read(InputStream input) throws IOException { @@ -115,8 +118,6 @@ public class DefinedName implements BIFFRecord { rgce = new byte[EndianConverter.readShort(cce)]; input.read(rgce, 0, EndianConverter.readShort(cce)); - - Debug.log(Debug.TRACE, "\tgrbit : "+ EndianConverter.readShort(grbit) + " cch : " + cch + " cce : " + EndianConverter.readShort(cce) + @@ -130,7 +131,7 @@ public class DefinedName implements BIFFRecord { /** * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code> * - * @param ouput the <code>OutputStream</code> + * @param output the <code>OutputStream</code> */ public void write(OutputStream output) throws IOException { @@ -143,7 +144,6 @@ public class DefinedName implements BIFFRecord { cce = EndianConverter.writeShort((short) 0); } - output.write(getBiffType()); output.write(grbit); output.write(cch); diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java index 5165efd84460..2ae615dc93ce 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java @@ -280,8 +280,8 @@ org.openoffice.xmerge.converter.xml.OfficeConstants { /** * Compare two ExtendedFormat to see if the font index is the same * - * @param the ExtendedFormat to be used in the comaprison - * @return boolean if the two are the same otherwise false + * @param rhs The ExtendedFormat to be used in the comaprison + * @return True if the two are the same otherwise false */ public boolean compareTo(ExtendedFormat rhs) { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java index 8d702640a500..1359134400ed 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java @@ -43,8 +43,7 @@ public class FloatNumber extends CellValue { protected byte[] num = new byte[8]; /** - * Constructs a pocket Excel Document from the - * <code>InputStream</code> and assigns it the document name passed in + * Constructs a FloatNumber by reading from an InputStream. * * @param is InputStream containing a Pocket Excel Data file. */ @@ -55,10 +54,10 @@ public class FloatNumber extends CellValue { /** * Constructs a <code>FloatNumber</code> using specified attributes * - * @param row row number - * @param col column number + * @param row row number + * @param column column number * @param cellContents contents of the cell - * @param ixfe font index + * @param ixfe font index */ public FloatNumber(int row, int column, String cellContents, int ixfe) throws IOException { @@ -104,7 +103,6 @@ public class FloatNumber extends CellValue { Debug.log(Debug.TRACE,"Writing FloatNumber record"); } - /** * Gets the numerical value the cell represents * diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java index 61d9746c80d3..1462e965ddd0 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java @@ -39,7 +39,6 @@ import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.util.ColourConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Represents a BIFF Record descibing a font used */ @@ -61,11 +60,9 @@ public class FontDescription implements BIFFRecord { public static final int ITALIC = 0x02; /** - * Constructs a FontDescription from the bold italic and undelrine attributes + * Constructs a FontDescription from a Format. * - * @param italic Italic attribute - * @param bold Bold attribute - * @param underline Underline attribute + * @param fmt The <code>Format</code> to use as source. */ public FontDescription(Format fmt) throws IOException { @@ -86,7 +83,6 @@ public class FontDescription implements BIFFRecord { if (fmt.getAttribute(Format.UNDERLINE)) uls |= UNDERLINE; - bFamily = 0; bCharSet = 0; @@ -188,7 +184,6 @@ public class FontDescription implements BIFFRecord { return true; } - /** * Constructs a Font Description from the <code>InputStream</code> * @@ -234,7 +229,7 @@ public class FontDescription implements BIFFRecord { /** * Constructs a Font Description from the <code>InputStream</code> * - * @param is InputStream containing a <code>FontDescription</code> + * @param input InputStream containing a <code>FontDescription</code> */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java index a073883b2e8e..90c28a1f7dd3 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java @@ -39,7 +39,6 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaHel import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Represents a BIFF Record describing a formula */ @@ -52,14 +51,15 @@ public class Formula extends CellValue implements OfficeConstants { private FormulaHelper fh = new FormulaHelper(); /** - * Constructs a <code>Formula</code> using specified attributes + * Constructs a <code>Formula</code> using specified attributes * - * @param row row number - * @param col column number + * @param row row number + * @param column column number * @param cellContents contents of the cell - * @param ixfe font index - * @param value the value of the cell - */ + * @param ixfe font index + * @param fmt cell format description. + * @param wb the workbook we are defined in. + */ public Formula(int row, int column, String cellContents, int ixfe, Format fmt, Workbook wb) throws Exception { @@ -116,7 +116,7 @@ public class Formula extends CellValue implements OfficeConstants { * Translates a <code>String</code> written in infix which represents a * formula into a byte[] what can be written to pocket excel file. * - * @param formula string + * @param inFormula formula string */ public void setFormula(String inFormula) throws Exception { @@ -129,6 +129,7 @@ public class Formula extends CellValue implements OfficeConstants { * <code>InputStream</code> * * @param is InputStream containing a Pocket Excel Data file. + * @param wb The workbook we are defined in. */ public Formula(InputStream is, Workbook wb) throws IOException { read(is); @@ -148,6 +149,7 @@ public class Formula extends CellValue implements OfficeConstants { * Reads the formula data members from the stream. Byte arrays for Strings * are doubled as they are stored as unicode * + * @param input the input stream to read from. * @return total number of bytes read */ public int read(InputStream input) throws IOException { @@ -175,7 +177,7 @@ public class Formula extends CellValue implements OfficeConstants { /** * Writes the Formula record to the <code>OutputStream</code> * - * @param the <code>OutputStream</code> being written to + * @param output The <code>OutputStream</code> being written to */ public void write(OutputStream output) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java index d4ad28cc7e2b..4d4ef3029823 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java @@ -35,7 +35,6 @@ import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Reperesent a BIFF Record descibing a cell containing a string */ @@ -47,10 +46,10 @@ public class LabelCell extends CellValue { /** * Constructs a <code>LabelCell</code> using specified attributes * - * @param row row number - * @param col column number + * @param row row number + * @param column column number * @param cellContents contents of the cell - * @param ixfe font index + * @param ixfe font index */ public LabelCell(int row, int column, String cellContents, int ixfe) throws IOException { @@ -73,7 +72,7 @@ public class LabelCell extends CellValue { /** * Writes a <code>LabelCell</code> to the specified <code>Outputstream</code> * - * @param os the <code>OutputStream</code> to write to + * @param output The <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { @@ -117,7 +116,6 @@ public class LabelCell extends CellValue { return numOfBytesRead; } - /** * Gets the <code>String</code> representing the cells contents * diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java index b65d1027f969..8c1547e3f2a1 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java @@ -124,9 +124,11 @@ public class Pane implements BIFFRecord { } /** - * Get the hex code for this particular <code>BIFFRecord</code> + * Set the pane number + * 0 - bottom right, 1 - top right + * 2 - bottom left, 3 - top left * - * @return the hex code for <code>Pane</code> + * @param paneNumber the pane number */ public void setPaneNumber(int paneNumber) { pnnAcct = (byte) paneNumber; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java index 8e3067d26c6b..5e36575d4296 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java @@ -35,7 +35,6 @@ import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Represents s BIFF Record that describes the format of a column */ @@ -94,7 +93,7 @@ public class Row implements BIFFRecord { } /** - * Get the rown number for this style + * Get the row number * * @return the row this style applies to */ @@ -105,7 +104,7 @@ public class Row implements BIFFRecord { /** * Reads a Row from an <code>InputStream</code> * - * @param is InputStream containing a Pane Record + * @param input InputStream containing a Row Record */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java index 308eae29227e..72dc960880b5 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java @@ -36,7 +36,6 @@ import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Represents a BIFF Record that describes the selected area of a worksheet */ @@ -81,9 +80,9 @@ public class Selection implements BIFFRecord { } /** - * Get the hex code for this particular <code>BIFFRecord</code> + * Get the active cell for this particular <code>BIFFRecord</code> * - * @return the hex code for <code>Selection</code> + * @return the cell position */ public Point getActiveCell() { Point p = new Point(colActive, EndianConverter.readShort(rwActive)); @@ -91,9 +90,9 @@ public class Selection implements BIFFRecord { } /** - * Get the hex code for this particular <code>BIFFRecord</code> + * Set the active cell position for this particular <code>BIFFRecord</code> * - * @return the hex code for <code>Selection</code> + * @param p The active cell position */ public void setActiveCell(Point p) { @@ -104,7 +103,7 @@ public class Selection implements BIFFRecord { /** * Reads a Selection Record from the <code>InputStream</code> * - * @param is InputStream containing a Pocket Excel Data file. + * @param input InputStream containing a Pocket Excel Data file. */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java index c516eca69b1b..af33a2a6b8d0 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java @@ -36,7 +36,6 @@ import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Represents a BIFF Record that describes the value of a formula that * evaluates to a string @@ -47,9 +46,9 @@ public class StringValue implements BIFFRecord { private byte[] rgch; /** - * Constructs a StringValue Record from an <code>InputStream</code> + * Constructs a StringValue Record from a string * - * @param is InputStream containing a StringValue Record + * @param str String containing value */ public StringValue(String str) throws IOException { cch = EndianConverter.writeShort((short) str.length()); @@ -78,7 +77,7 @@ public class StringValue implements BIFFRecord { /** * Reads a StringVlaue Record from an <code>InputStream</code> * - * @param is InputStream containing a StringValue Record + * @param input InputStream containing a StringValue Record */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java index c060db90d60d..d2c256e41e1e 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java @@ -35,7 +35,6 @@ import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * Represents a BIFF REcord that describes workbook window attributes */ @@ -91,7 +90,7 @@ public class Window1 implements BIFFRecord { /** * Reads a Window1 Record from an <code>InputStream</code> * - * @param is InputStream containing a Window1 Record + * @param input InputStream containing a Window1 Record */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java index 4c49a941219c..12bc74641092 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java @@ -37,7 +37,6 @@ import org.openoffice.xmerge.util.EndianConverter; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; - /** * Represents a BIFF Record that describes worksheet window attributes */ @@ -127,7 +126,7 @@ public class Window2 implements BIFFRecord { /** * Reads a Window2 Record from an <code>InputStream</code> * - * @param is InputStream containing a Window2 Record + * @param input InputStream containing a Window2 Record */ public int read(InputStream input) throws IOException { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java index 5a9f329e4667..2fb8f416c037 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java @@ -69,7 +69,6 @@ OfficeConstants { eof = new Eof(); } - /** * Constructs a pocket Excel Workbook with the name of the file passed in * as an argument. Also fills out a basic header block containing the @@ -91,7 +90,9 @@ OfficeConstants { * Constructs a pocket Excel Workbook from the * <code>InputStream</code> and assigns it the document name passed in * - * @param is InputStream containing a Pocket Excel Data file. + * @param name Name of the Pocket Excel Data file. (including the file + * extension) + * @param is InputStream containing a Pocket Excel Data file. */ public Workbook(String name, InputStream is) throws IOException { read(is); @@ -240,7 +241,7 @@ OfficeConstants { /** * Adds a ExtendedFormat record to the workbook * - * @param f the font recrod to add + * @param fmt the font record to add */ public int addExtendedFormat(Format fmt) throws IOException { @@ -362,7 +363,7 @@ OfficeConstants { /** * Adds a <code>Worksheet</code> to the workbook. * - * @return name the name of the <code>Worksheet</code> to be added + * @param name the name of the <code>Worksheet</code> to be added */ public void addWorksheet(String name) throws IOException { @@ -376,7 +377,10 @@ OfficeConstants { /** * Adds a cell to the current worksheet. * - * @return the name of the <code>Worksheet</code> to be added + * @param row Row index for the new cell. + * @param col Column index for the new cell. + * @param fmt Format description for the new cell. + * @param cellContents Contents for the new cell. */ public void addCell(int row,int col, Format fmt, String cellContents) throws IOException { @@ -429,7 +433,7 @@ OfficeConstants { /** * Will create a number of ColInfo records based on the column widths - * based in. + * passed in. * * @param columnRows <code>Vector</code> of <code>ColumnRowInfo</code> */ @@ -470,12 +474,11 @@ OfficeConstants { } } - /** - * Will create a number of ColInfo recrods based on the column widths - * based in. - * - * @param an integer list representing the column widths - */ + /** + * Add a name definition to the workbook. + * + * @param nameDefinition The name definition to add. + */ public void addNameDefinition(NameDefinition nameDefinition) throws IOException { DefinedName dn = new DefinedName(nameDefinition, this); diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java index 6ab57189f39f..7c43122cef76 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java @@ -38,7 +38,6 @@ import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.converter.xml.sxc.SheetSettings; import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; - /** * This class is used by <code>PxlDocument</code> to maintain pexcel * worksheets. @@ -61,18 +60,16 @@ public class Worksheet { private Eof eof; /** - * Writes the current workbook to the <code>Outputstream</code> + * Creates a worksheet in a given workbook. * - * @param os The destination outputstream + * @param wb The destination workbook. */ public Worksheet(Workbook wb) { this.wb = wb; } /** - * Default Contructor - * - * @param os The destination outputstream + * Default Contructor. Creates a worksheet not attached to any workbook. */ public Worksheet() { } @@ -108,11 +105,12 @@ public class Worksheet { } /** - * Reads a worksheet from the <code>InputStream</code> and contructs a + * Reads a worksheet from the <code>InputStream</code> and contructs a * workbook object from it * - * @param is InputStream containing a Pocket Excel Data file. - */ + * @param is InputStream containing a Pocket Excel Data file. + * @return True if we read anything. False if not. + */ public boolean read(InputStream is) throws IOException { int b = is.read(); @@ -230,38 +228,38 @@ public class Worksheet { } /** - * Adds a cell to this worksheet. Current valdid celltypes are - * <code>FloatNumber</code>, <code>LabelCell</code> or <code>Formula</code> + * Adds a cell to this worksheet based on a <code>BIFFRecord</code>. + * Current valdid celltypes are <code>FloatNumber</code>, + * <code>LabelCell</code> or <code>Formula</code> * - * @param f the font recrod to add - */ + * @param br The <code>BIFFRecord</code> to read from. + */ public void addCell(BIFFRecord br) { cells.add(br); } /** - * Adds a number of ColInfo Records to the worksheet base on a list of - * clumnwidths passed in + * Adds a row to the worksheet. * - * @param list of column widths - */ + * @param r The row to add. + */ public void addRow(Row r) { rows.add(r); } /** - * Adds a number of ColInfo Records to the worksheet base on a list of - * clumnwidths passed in + * Adds a ColInfo record to the worksheet. This may effec more than one column. * - * @param list of column widths - */ + * @param c ColInfo structure defining widths, format etc. + */ public void addCol(ColInfo c) { colInfo.add(c); } + /** - * Returns an <code>Enumeration</code> to the ColInfo's for this worksheet + * Add various settings to this worksheet. * - * @return an <code>Enumeration</code> to the ColInfo's + * @param s SheetSettings object defining pane number, splits etc. */ public void addSettings(SheetSettings s) { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java index 2e060ca0a148..ff1facbcc279 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java @@ -154,7 +154,6 @@ public class FormulaCompiler { bPop = false; } else { tmpTok = (Token)evalStack.pop(); - //if (!(isOpenBrace(tmpTok) || isParamDelimiter(tmpTok))) { //Don't output brackets and commas if (!isParamDelimiter(tmpTok)) { //Don't output commas rpnExpr.add(tmpTok); } diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java index 208feb030f36..1ae9388d013d 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java @@ -37,7 +37,7 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook; /** * This Helper class provides a simplified interface to conversion between PocketXL formula representation * and Calc formula representation.<p> - * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula} + * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula} */ public class FormulaHelper { diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java index 551b77cf6e7f..1f2bef7b1d92 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java @@ -31,7 +31,7 @@ import java.util.HashMap; /** * This class defines the precedence applied to each operator when performing a conversion - * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2 from infix to RPN.}. + * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler.infix2RPN from infix to RPN}. */ public class PrecedenceTable { public static final int DEFAULT_PRECEDENCE = 0; diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java index bf7722b973e4..521799d518f1 100644 --- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java +++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java @@ -48,7 +48,7 @@ public abstract class SymbolLookup { /** * Associate a symbol with a numeric value in the lookup table * @param symbol The symbol that will act as the key in the lookup table - * @param value The value to be associated with a given symbol + * @param id The ID number to be associated with a given symbol */ public void addEntry(String symbol, int id) { Integer iObj = new Integer(id); diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java index 08424a073803..db53410633ff 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java @@ -45,7 +45,6 @@ import org.openoffice.xmerge.converter.xml.StyleCatalog; import java.io.IOException; - /** * <p>Pocket Word implementation of <code>DocumentDeserializer</code> * for use by {@link @@ -67,7 +66,6 @@ public final class DocumentSerializerImpl private boolean inList = false; - /** * <p>Initialises a new <code>DocumentSerializerImpl</code> using the.<br> * supplied <code>Document</code></p> @@ -76,14 +74,13 @@ public final class DocumentSerializerImpl * org.openoffice.xmerge.converter.xml.sxw.SxwDocument SxwDocument} * object.</p> * - * @param document The <code>Document</code> to convert. + * @param doc The <code>Document</code> to convert. */ public DocumentSerializerImpl(Document doc) { sxwDoc = (SxwDocument)doc; pswDoc = new PocketWordDocument(sxwDoc.getName()); } - /** * <p>Convert the data passed into the <code>DocumentSerializerImpl</code> * constructor into Pocket Word format.</p> @@ -119,7 +116,6 @@ public final class DocumentSerializerImpl return cd; } - /* * Handles the loading of defined styles from the style.xml file as well * as automatic styles from the content.xml file. @@ -175,7 +171,6 @@ public final class DocumentSerializerImpl } } - /* * Process the office:body tag. */ @@ -205,7 +200,6 @@ public final class DocumentSerializerImpl } } - /* * Process a text:p tag */ @@ -238,7 +232,6 @@ public final class DocumentSerializerImpl traverseParagraphContents(node, tstyle); } - /* * Process the contents of a paragraph. This method handles situations * where the paragraph contains multiple children, each representing a @@ -356,7 +349,6 @@ public final class DocumentSerializerImpl } } - /* * Process a text:ordered-list or text:unordered-list tag. Pocket Word has * no concept of a list so there is no need to differentiate between the @@ -387,7 +379,6 @@ public final class DocumentSerializerImpl inList = false; } - /* * Process a text:list-item node. They usually contain have a single * text:p child but can also have sections or other lists. @@ -414,7 +405,6 @@ public final class DocumentSerializerImpl } - /* * Utility method to retrieve a Node attribute. */ diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java index bc77e0fa6988..29e04e841203 100644 --- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java +++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java @@ -105,7 +105,7 @@ public class PocketWordDocument implements Document, PocketWordConstants { * <p>This method reads <code>byte</code> data from the InputStream and * extracts font and paragraph data from the file.</p> * - * @param is InputStream containing a Pocket Word data file. + * @param docData InputStream containing a Pocket Word data file. * * @throws IOException In case of any I/O errors. */ diff --git a/xmerge/source/regutil/regutil.cpp b/xmerge/source/regutil/regutil.cpp index 3703192d79b5..17b1656fb282 100644 --- a/xmerge/source/regutil/regutil.cpp +++ b/xmerge/source/regutil/regutil.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * Simple Application which calls the DllRegisterServer or DllUnregisterServer functions * of the XMerge ActiveSync plugin. @@ -99,4 +100,5 @@ int main(int argc, char* argv[]) FreeLibrary(hmXMDll); return 0; -}
\ No newline at end of file +} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java index 29098b72cc17..91c0074f4698 100644 --- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java +++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java @@ -551,15 +551,5 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer { Debug.log(Debug.TRACE, str); } - - - /* - public static void main(String args[]) { - - // DocumentDeserializerImpl d = new DocumentDeserializerImpl(new InputStream()); - - Node nodes[] = parseText("Tab here:\tThen some more text"); - } -*/ } diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java index 36b21e21b931..bbd105a2097f 100644 --- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java +++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WsePara.java @@ -261,30 +261,13 @@ class WsePara extends Wse { temp = firstIndent / 1.6; values[2] = (new Double(temp)).toString() + "mm"; -/* if ((lineSpace & LS_MULTIPLE) != 0) { - temp = (lineSpace & LS_VALUEMASK) / 2; - temp *= 100; - values[3] = (new Double(temp)).toString() + "%"; - } else { - values[3] = (new Double(temp)).toString() + "mm"; - // DJP: handle other cases - } -*/ temp = spaceBefore / 1.6; -// values[4] = (new Double(temp)).toString() + "mm"; values[3] = (new Double(temp)).toString() + "mm"; temp = spaceAfter / 1.6; -// values[5] = (new Double(temp)).toString() + "mm"; values[4] = (new Double(temp)).toString() + "mm"; switch (misc) { - -// case ALIGN_RIGHT: values[6] = "right"; break; -// case ALIGN_LEFT: values[6] = "left"; break; -// case ALIGN_CENTER:values[6] = "center"; break; -// case ALIGN_JUST: values[6] = "justified"; break; - case ALIGN_RIGHT: values[5] = "right"; break; case ALIGN_LEFT: values[5] = "left"; break; case ALIGN_CENTER:values[5] = "center"; break; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java index f7df881b1061..9ba4aca7cf41 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java @@ -157,7 +157,7 @@ public class DOMDocument * Sets the Content of the <code>Document</code> to the contents of the * supplied <code>Node</code> list. * - * @return DOM <code>Document</code> object. + * @param newDom DOM <code>Document</code> object. */ public void setContentDOM( Node newDom) { contentDoc=(Document)newDom; @@ -202,7 +202,6 @@ public class DOMDocument builder = factory.newDocumentBuilder(); } catch (ParserConfigurationException ex) { System.out.println("Error:"+ ex); - //throw new OfficeDocumentException(ex); } try { @@ -211,7 +210,6 @@ public class DOMDocument } catch (SAXException ex) { System.out.println("Error:"+ ex); - //throw new OfficeDocumentException(ex); } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java index 668bfdb7f155..99038df73cc6 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java @@ -120,7 +120,7 @@ public class PalmDocument /** * Writes the <code>PalmDocument</code> to an <code>OutputStream</code>. * - * @param is The <code>OutputStream</code> to write the content. + * @param os The <code>OutputStream</code> to write the content. * * @throws IOException If any I/O error occurs. */ diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java index 23690792bdbf..f2b1d557006e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java @@ -138,7 +138,7 @@ public final class Record { * <code>Record</code> length followed by the data in this * <code>Record</code> object. * - * @param out The <code>OutputStream</code> to write the object. + * @param outs The <code>OutputStream</code> to write the object. * * @throws IOException If any I/O error occurs. */ @@ -155,7 +155,7 @@ public final class Record { * Read the necessary data to create a PDB from * the <code>InputStream</code>. * - * @param in The <code>InputStream</code> to read data from + * @param ins The <code>InputStream</code> to read data from * in order to restore the <code>object</code>. * * @throws IOException If any I/O error occurs. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java index 6e5f123ded53..dcf82bd2ace6 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java @@ -138,7 +138,7 @@ public class EmbeddedXMLObject extends EmbeddedObject { /** * Sets the settings data for the embedded object. * - * @param styles DOM representation of the object's styles. + * @param settings DOM representation of the object's styles. */ public void setSettingsDOM(Document settings) { settingsDOM = settings; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java index d3372be5a757..a6be6c044852 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java @@ -531,13 +531,9 @@ public abstract class OfficeDocument } else{ try{ - //System.out.println("\nParsing Input stream, validating?: "+builder.isValidating()); - //contentDoc= builder.parse((InputStream)is); - Reader r = secondHack(is); InputSource ins = new InputSource(r); org.w3c.dom.Document newDoc = builder.parse(ins); - //org.w3c.dom.Document newDoc = builder.parse((InputStream)is); Element rootElement=newDoc.getDocumentElement(); NodeList nodeList; @@ -829,13 +825,11 @@ public abstract class OfficeDocument } byte contentBytes[] = docToBytes(newDoc); - //System.out.println(new String(contentBytes)); os.write(contentBytes); } catch(Exception exc){ System.out.println("\nException in OfficeDocument.write():" +exc); } - //byte contentBytes[] = docToBytes(contentDoc); } } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index 662a542d0e7b..1fc12df46fb8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -269,15 +269,15 @@ public class ParaStyle extends Style implements Cloneable { /** * Constructor for use when going from client device format to DOM. * - * @param name Name of the <code>Style</code>. Can be null. - * @param family Family of the <code>Style</code> - usually - * <i>paragraph</i>, <i>text</i>, etc. Can be null. - * @param parent Name of the parent <code>Style</code>, or null - * if none. - * @param attribs Array of attributes to set. - * @param values Array of values to set. - * @param sc The <code>StyleCatalog</code>, which is used for - * looking up ancestor <code>Style</code> objects. + * @param name Name of the <code>Style</code>. Can be null. + * @param familyName Family of the <code>Style</code> - usually + * <i>paragraph</i>, <i>text</i>, etc. Can be null. + * @param parentName Name of the parent <code>Style</code>, or null + * if none. + * @param attribs Array of attributes to set. + * @param values Array of values to set. + * @param sc The <code>StyleCatalog</code>, which is used for + * looking up ancestor <code>Style</code> objects. */ public ParaStyle(String name, String familyName, String parentName, String attribs[], String values[], StyleCatalog sc) { @@ -292,15 +292,15 @@ public class ParaStyle extends Style implements Cloneable { * Alternate constructor for use when going from client device * format to DOM. * - * @param name Name of the <code>Style</code>. Can be null. - * @param family Family of the <code>Style</code> - usually - * <i>paragraph</i>, <i>text</i>, etc. Can be null. - * @param parent Name of the parent <code>Style</code>, or - * null if none. - * @param attribs Array of attributes indices to set. - * @param values Array of values to set. - * @param sc The <code>StyleCatalog</code>, which is used for - * looking up ancestor <code>Style</code> objects. + * @param name Name of the <code>Style</code>. Can be null. + * @param familyName Family of the <code>Style</code> - usually + * <i>paragraph</i>, <i>text</i>, etc. Can be null. + * @param parentName Name of the parent <code>Style</code>, or + * null if none. + * @param attribs Array of attributes indices to set. + * @param values Array of values to set. + * @param lookup The <code>StyleCatalog</code>, which is used for + * looking up ancestor <code>Style</code> objects. */ public ParaStyle(String name, String familyName, String parentName, int attribs[], String values[], StyleCatalog lookup) { @@ -377,7 +377,7 @@ public class ParaStyle extends Style implements Cloneable { * Set an attribute for this paragraph <code>Style</code>. * * @param attr The attribute index to set. - * @apram value The attribute value to set. + * @param value The attribute value to set. */ public void setAttribute(int attr, String value) { isSet[attr] = true; @@ -500,9 +500,9 @@ public class ParaStyle extends Style implements Cloneable { /** * Create the <code>Node</code> with the specified elements. * - * @parentDoc Parent <code>Document</code> of the - * <code>Node</code> to create. - * @param name Name of the <code>Node</code>. + * @param parentDoc Parent <code>Document</code> of the + * <code>Node</code> to create. + * @param name Name of the <code>Node</code>. * * @return The created <code>Node</code>. */ @@ -532,8 +532,6 @@ public class ParaStyle extends Style implements Cloneable { for (int i = 0; i < NR_PROPERTIES; i++) { if (ps.isSet[i]) { - // if (!isSet[i]) return false; - if (i < NR_PROPERTIES - 1) { // Compare the actual values. We allow a margin of error // here because the conversion loses precision. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java index c783d366a68b..4548d672bb9f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java @@ -289,7 +289,6 @@ public class StyleCatalog { styleNode.setAttribute("style:family", s.getFamily()); Element propertiesNode = (Element) s.createNode(parentDoc, "style:properties"); - // if (propertiesNode.getFirstChild() != null) // DJP: only add node if has children OR attributes if (propertiesNode != null) styleNode.appendChild(propertiesNode); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index 91926310776c..c1a4430b32f1 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -78,7 +78,7 @@ public class TextStyle extends Style implements Cloneable { /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java index 9c1ae2768524..d5baba59a7e3 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java @@ -54,33 +54,37 @@ public class BookSettings implements OfficeConstants { private Vector worksheetSettings = new Vector(); /** - * Default Constructor for a <code>BookSettings</code> + * Constructor for a <code>BookSettings</code>. Reads document settings + * from xml and inits SheetSettings variables. * - * @param dimension if it's a row the height, a column the width - * @param repeated + * @param root The root XML node to read from. */ public BookSettings(Node root) { readNode(root); } /** - * Default Constructor for a <code>BookSettings</code> + * Constructor for a <code>BookSettings</code> * - * @param worksheetSettings if it's a row the height, a column the width + * @param worksheetSettings If it's a row the height, a column the width */ public BookSettings(Vector worksheetSettings) { this.worksheetSettings = worksheetSettings; } /** + * Set the flag indicating whether we have row/column headers. * + * @param hasColumnRowHeaders Flag to enable or disable headers. */ public void setColumnRowHeaders(boolean hasColumnRowHeaders) { this.hasColumnRowHeaders = hasColumnRowHeaders; } /** + * Get the flag indicating whether we have row/column headers. * + * @return Flag indicating whether we have row/column headers. */ public boolean hasColumnRowHeaders() { return hasColumnRowHeaders; @@ -115,7 +119,6 @@ public class BookSettings implements OfficeConstants { this.activeSheet = activeSheet; } - /** * Adds an XML entry for a particular setting * diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index 2e3e34b6d620..0c5746ee8e7d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -50,7 +50,7 @@ public class CellStyle extends Style implements Cloneable { /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java index 14c1dbfc8e77..8b39e469ad4c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java @@ -50,8 +50,7 @@ public class ColumnRowInfo { /** * Constructor for a <code>ColumnRowInfo</code> * - * @param dimension if it's a row the height, a column the width - * @param repeated + * @param type whether ROW or COLUMN record . */ public ColumnRowInfo(int type) { @@ -61,9 +60,9 @@ public class ColumnRowInfo { /** * Constructor for a <code>ColumnRowInfo</code> * - * @param dimension if it's a row the height, a column the width - * @param repeated how many times it is repeated - * @param type whether Row or column record + * @param dimension if it's a row the height, a column the width. + * @param repeated how many times it is repeated. + * @param type whether ROW or COLUMN record. */ public ColumnRowInfo(int dimension, int repeated, int type) { @@ -73,9 +72,13 @@ public class ColumnRowInfo { } /** - * Constructor that includes userDefined field + * Constructor for a <code>ColumnRowInfo</code> that includes userDefined + * field. * - * @param userDefined whether the record is manually set + * @param dimension if it's a row the height, a column the width. + * @param repeated how many times it is repeated. + * @param type whether ROW or COLUMN record. + * @param userDefined whether the record is manually set. */ public ColumnRowInfo(int dimension, int repeated, int type, boolean userDefined) { @@ -84,9 +87,9 @@ public class ColumnRowInfo { } /** - * sets the definition + * Sets the format. * - * @param newDefinition sets the definition + * @param fmt The new format to use. */ public void setFormat(Format fmt) { @@ -94,9 +97,9 @@ public class ColumnRowInfo { } /** - * returns Name of the definition + * Get the current format. * - * @return the name which identifies the definition + * @return The current format. */ public Format getFormat() { @@ -104,9 +107,9 @@ public class ColumnRowInfo { } /** - * returns Name of the definition + * Get the height (for rows) or width (for columns). * - * @return the name which identifies the definition + * @return The height or width. */ public int getSize() { @@ -114,18 +117,19 @@ public class ColumnRowInfo { } /** - * sets the definition + * Set the height (for rows) or width (for columns). * - * @param newDefinition sets the definition + * @param dimension The height or width. */ public void setSize(int dimension) { this.dimension = dimension; } + /** - * Returns the definition itself + * Get the repeat count for this item. * - * @return the definition + * @return The number of times this item is repeated. */ public int getRepeated() { @@ -133,9 +137,9 @@ public class ColumnRowInfo { } /** - * Returns the base Cell address + * Set the repeat count for this item. * - * @return the base cell address + * @param repeated The number of times this item is repeated. */ public void setRepeated(int repeated) { @@ -143,9 +147,9 @@ public class ColumnRowInfo { } /** - * Returns the definition itself + * Does this <code>ColumnRowInfo</code> represent a row? * - * @return the definition + * @return True if a row, false if not. */ public boolean isRow() { @@ -156,9 +160,9 @@ public class ColumnRowInfo { } /** - * Returns the base Cell address + * Does this <code>ColumnRowInfo</code> represent a column? * - * @return the base cell address + * @return True if a column, false if not. */ public boolean isColumn() { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index 76c742b57496..e937cfd7acb4 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -48,7 +48,7 @@ public class ColumnStyle extends Style implements Cloneable { /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for @@ -92,7 +92,6 @@ public class ColumnStyle extends Style implements Cloneable { } } - /** * Constructor for use when going from client device format to DOM * @@ -101,11 +100,11 @@ public class ColumnStyle extends Style implements Cloneable { * <i>text</i>). Can be null. * @param parent Name of parent text <code>Style</code>, or null * for none. - * @param mask the width of this column - * @param sc The <code>StyleCatalog</code>, which is used for + * @param colWidth the width of this column + * @param sc The <code>StyleCatalog</code>, which is used for * looking up ancestor <code>Style</code> objects. */ - public ColumnStyle(String name, String family, String parent,int colWidth, StyleCatalog sc) { + public ColumnStyle(String name, String family, String parent, int colWidth, StyleCatalog sc) { super(name, family, parent, sc); this.colWidth = colWidth; } @@ -113,7 +112,7 @@ public class ColumnStyle extends Style implements Cloneable { /** * Returns the width of this column * - * @return the <code>Format</code> object + * @return The width of this column. */ public int getColWidth() { return colWidth; @@ -122,7 +121,7 @@ public class ColumnStyle extends Style implements Cloneable { /** * Sets the width of this column * - * @return the <code>Format</code> object + * @param colWidth The width of this column. */ public void setColWidth(int colWidth) { @@ -151,7 +150,6 @@ public class ColumnStyle extends Style implements Cloneable { return (width); } - /** * Set an attribute. * @@ -168,7 +166,6 @@ public class ColumnStyle extends Style implements Cloneable { } } - /** * Return a <code>Style</code> object corresponding to this one, * but with all of the inherited information from parent @@ -176,7 +173,7 @@ public class ColumnStyle extends Style implements Cloneable { * be a new object, not a reference to this object, even if it does * not need any information added. * - * @return The <code>StyleCatalog</code> in which to look up + * @return The <code>Style</code> in which to look up * ancestors. */ public Style getResolved() { @@ -218,7 +215,6 @@ public class ColumnStyle extends Style implements Cloneable { return resolved; } - /** * Create a new <code>Node</code> in the <code>Document</code>, and * write this <code>Style</code> to it. @@ -236,7 +232,6 @@ public class ColumnStyle extends Style implements Cloneable { return node; } - /** * Return true if <code>style</code> specifies as much or less * than this <code>Style</code>, and nothing it specifies @@ -258,7 +253,6 @@ public class ColumnStyle extends Style implements Cloneable { return true; } - /** * Write this <code>Style</code> object's attributes to a * <code>Node</code> in the <code>Document</code>. @@ -274,12 +268,10 @@ public class ColumnStyle extends Style implements Cloneable { } } - private static String[] ignored = { "fo:break-before", "fo:keep-with-next" }; - /* * This code checks whether an attribute is one that we * intentionally ignore. @@ -297,4 +289,3 @@ public class ColumnStyle extends Style implements Cloneable { return false; } } - diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index 2bb836a7303d..7d142e0d69d0 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -98,6 +98,9 @@ public class Format implements Cloneable { * Constructor that creates a new <code>Format</code> object * by setting all the format attributes. * + * @param attributes Attributes flags (alignment, bold, etc.) + * @param fontSize Size of the font in points. + * @param fontName Name of the font to use. */ public Format(int attributes, int fontSize, String fontName) { @@ -129,7 +132,6 @@ public class Format implements Cloneable { sizeInPoints = fmt.sizeInPoints; } - /** * Reset this <code>Format</code> description. */ @@ -149,9 +151,10 @@ public class Format implements Cloneable { } /** - * Set one or more text attributes to <i>on</i>. + * Set one or more text attributes. * - * @param flags Flag attributes to set <i>on</i>. + * @param flags Flag attributes to set. + * @param toggle True to set flags, false to clear them. */ public void setAttribute(int flags, boolean toggle) { mask |= flags; @@ -192,7 +195,6 @@ public class Format implements Cloneable { return (!((mask & attribute) == 0)); } - /** * Set the formatting category of this object, ie number, date, * currency.The <code>OfficeConstants</code> class contains string @@ -236,7 +238,6 @@ public class Format implements Cloneable { value = newValue; } - /** * Set the <code>Format</code> specifier for this category. * @@ -246,7 +247,6 @@ public class Format implements Cloneable { formatSpecifier = formatString; } - /** * Get the <code>Format</code> specifier for this category. * @@ -256,7 +256,6 @@ public class Format implements Cloneable { return formatSpecifier; } - /** * Set the precision of the number to be displayed. * @@ -266,7 +265,6 @@ public class Format implements Cloneable { decimalPlaces = precision; } - /** * Get the number of decimal places displayed. * @@ -276,7 +274,6 @@ public class Format implements Cloneable { return decimalPlaces; } - /** * Set the font used for this cell. * @@ -286,7 +283,6 @@ public class Format implements Cloneable { this.fontName = fontName; } - /** * Get the font used for this cell. * @@ -297,65 +293,63 @@ public class Format implements Cloneable { } /** - * Set the font used for this cell. + * Set the font size (in points) used for this cell. * - * @param fontName The name of the font. + * @param fontSize The font size in points. */ public void setFontSize(int fontSize) { sizeInPoints = fontSize; } - /** - * Get the font used for this cell. + * Get the font size (in points) used for this cell. * - * @return The font name. + * @return The font size in points. */ public int getFontSize() { return sizeInPoints; } /** - * Set the alignmen used for this cell. + * Set the vertical alignment used for this cell. * - * @param fontName The name of the font. + * @param vertAlign The vertical alignment. */ public void setVertAlign(int vertAlign) { this.vertAlign = vertAlign; } - /** - * Get the alignment used for this cell. + * Get the vertical alignment used for this cell. * - * @return The font name. + * @return The vertical alignment. */ public int getVertAlign() { return vertAlign; } /** - * Set the alignmen used for this cell. + * Set the alignment used for this cell. * - * @param fontName The name of the font. + * @param align The alignment to use. */ public void setAlign(int align) { this.align = align; } - /** * Get the alignment used for this cell. * - * @return The font name. + * @return The alignment. */ public int getAlign() { return align; } + /** * Set the Foreground <code>Color</code> for this cell. * - * @param color A <code>Color</code> object representing the + * @param c A <code>Color</code> object representing the * foreground color. */ public void setForeground(Color c) { @@ -363,7 +357,6 @@ public class Format implements Cloneable { foreground = new Color(c.getRGB()); } - /** * Get the Foreground <code>Color</code> for this cell. * @@ -373,11 +366,10 @@ public class Format implements Cloneable { return foreground; } - /** * Set the Background <code>Color</code> for this cell * - * @param color A <code>Color</code> object representing + * @param c A <code>Color</code> object representing * the background color. */ public void setBackground(Color c) { @@ -385,9 +377,8 @@ public class Format implements Cloneable { background = new Color(c.getRGB()); } - /** - * Get the Foreground <code>Color</code> for this cell + * Get the Background <code>Color</code> for this cell * * @return Background <code>Color</code> value */ @@ -396,9 +387,9 @@ public class Format implements Cloneable { } /** - * Get the Foreground <code>Color</code> for this cell + * Get a string representation of this <code>Format</code> * - * @return Background <code>Color</code> value + * @return A string indicating the value and category. */ public String toString() { return new String("Value : " + getValue() + " Category : " + getCategory()); @@ -433,13 +424,13 @@ public class Format implements Cloneable { } /** - * Return true if <code>style</code> specifies as much or less - * than this <code>Style</code>, and nothing it specifies - * contradicts this <code>Style</code>. + * Return true if passed <code>Format</code> specifies as much or less + * than this <code>Format</code>, and nothing it specifies + * contradicts this <code>Format</code>. * - * @param style The <code>Style</code> to check. + * @param rhs The <code>Format</code> to check. * - * @return true if <code>style</code> is a subset, false + * @return true if <code>rhs</code> is a subset, false * otherwise. */ public boolean isSubset(Format rhs) { @@ -472,4 +463,3 @@ public class Format implements Cloneable { return true; } } - diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java index de83543fd86e..b0ae4e6e1721 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java @@ -68,8 +68,13 @@ public class NameDefinition implements OfficeConstants { } /** - * Default Constructor for a <code>NameDefinition</code> + * Constructor for a <code>NameDefinition</code> * + * @param name Name that identifies the definition + * @param definition The definition itself + * @param baseCellAddress The base cell address + * @param rangeType True if definition of range type + * @param expressionType True if definition of expression type */ public NameDefinition(String name, String definition, String baseCellAddress, boolean rangeType, boolean expressionType ) { @@ -139,8 +144,8 @@ public class NameDefinition implements OfficeConstants { /** * Writes out a content.xml entry for this NameDefinition object * - * @param settings a <code>Document</code> object representing the settings.xml - * @param root the root xml node to add to + * @param doc A <code>Document</code> object representing the settings.xml + * @param root The root xml node to add to */ public void writeNode(org.w3c.dom.Document doc, Node root) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 2b4ce04a13f0..64eb20b962e7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -48,7 +48,7 @@ public class RowStyle extends Style implements Cloneable { /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for @@ -92,16 +92,15 @@ public class RowStyle extends Style implements Cloneable { } } - /** * Constructor for use when going from client device format to DOM * - * @param name Name of text <code>Style</code>. Can be null. - * @param family Family of text <code>Style</code> (usually + * @param name Name of text <code>Style</code>. Can be null. + * @param family Family of text <code>Style</code> (usually * <i>text</i>). Can be null. - * @param parent Name of parent text <code>Style</code>, or null + * @param parent Name of parent text <code>Style</code>, or null * for none. - * @param mask The height of this row + * @param rowHeight The height of this row * @param sc The <code>StyleCatalog</code>, which is used for * looking up ancestor <code>Style</code> objects. */ @@ -113,7 +112,7 @@ public class RowStyle extends Style implements Cloneable { /** * Returns the height of this row * - * @return the <code>Format</code> object + * @return The height of this row. */ public int getRowHeight() { return rowHeight; @@ -122,14 +121,14 @@ public class RowStyle extends Style implements Cloneable { /** * Sets the height of this row * - * @return the <code>Format</code> object + * @param RowHeight The height of this row. */ public void setRowHeight(int RowHeight) { this.rowHeight = rowHeight; } /** - * Parse a colheight in the form "1.234cm" to twips + * Parse a rowheight in the form "1.234cm" to twips * * @param value <code>String</code> specification to parse. * @@ -151,7 +150,6 @@ public class RowStyle extends Style implements Cloneable { } - /** * Set an attribute. * @@ -168,7 +166,6 @@ public class RowStyle extends Style implements Cloneable { } } - /** * Return a <code>Style</code> object corresponding to this one, * but with all of the inherited information from parent @@ -218,7 +215,6 @@ public class RowStyle extends Style implements Cloneable { return resolved; } - /** * Create a new <code>Node</code> in the <code>Document</code>, and * write this <code>Style</code> to it. @@ -236,7 +232,6 @@ public class RowStyle extends Style implements Cloneable { return node; } - /** * Return true if <code>style</code> specifies as much or less * than this <code>Style</code>, and nothing it specifies @@ -258,7 +253,6 @@ public class RowStyle extends Style implements Cloneable { return true; } - /** * Write this <code>Style</code> object's attributes to a * <code>Node</code> in the <code>Document</code>. @@ -274,12 +268,10 @@ public class RowStyle extends Style implements Cloneable { } } - private static String[] ignored = { "fo:break-before", "fo:keep-with-next" }; - /* * This code checks whether an attribute is one that we * intentionally ignore. @@ -297,4 +289,3 @@ public class RowStyle extends Style implements Cloneable { return false; } } - diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java index 4258e1a5e035..df54d1bbcdb8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java @@ -63,9 +63,8 @@ public class SheetSettings implements OfficeConstants { final public static int SPLIT = 0x01; final public static int FREEZE = 0x02; - /** - * Default Constructor for a <code>ColumnRowInfo</code> + * Default Constructor for a <code>SheetSettings</code> * */ public SheetSettings() { @@ -81,10 +80,9 @@ public class SheetSettings implements OfficeConstants { } /** - * Constructor for a <code>ColumnRowInfo</code> + * Constructor for a <code>SheetSettings</code> * - * @param dimension if it's a row the height, a column the width - * @param repeated + * @param name The name for the new sheet */ public SheetSettings(String name) { sheetName = name; @@ -138,7 +136,7 @@ public class SheetSettings implements OfficeConstants { } /** - * sets the position and type of the split + * gets the position of the split * * @return The position as a <code>Point</code> where the split occurs */ @@ -148,9 +146,9 @@ public class SheetSettings implements OfficeConstants { } /** - * sets the position and type of the split + * gets the type of the split * - * @return The position as a <code>Point</code> where the split occurs + * @return The split type as a <code>Point</code> */ public Point getSplitType() { @@ -180,11 +178,9 @@ public class SheetSettings implements OfficeConstants { return posLeft; } /** - * Sets the top row visible in the lower pane and the leftmost column - * visibile in the right pane. + * Gets the top row visible in the lower pane. * - * @param top The top row visible in the lower pane - * @param left The leftmost column visibile in the right pane + * @return The top row visible in the lower pane */ public int getTop() { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java index fc965bcd88b1..fe7a61e3cbae 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java @@ -105,24 +105,22 @@ public abstract class SpreadsheetEncoder { /** * Set the width of the columns in the WorkBook. * - * @param columnWidths An <code>IntArrayList</code> of column + * @param columnRows An <code>IntArrayList</code> of column * widths. */ public abstract void setColumnRows(Vector columnRows) throws IOException; /** - * Set the width of the columns in the WorkBook. + * Set the name definition of this spreadsheet * - * @param columnWidths An <code>IntArrayList</code> of column - * widths. + * @param nd The <code>NameDefinition</code> to use. */ public abstract void setNameDefinition(NameDefinition nd) throws IOException; /** - * Set the width of the columns in the WorkBook. + * Adds settings to the WorkBook. * - * @param columnWidths An <code>IntArrayList</code> of column - * widths. + * @param s The <code>BookSettings</code> to add. */ public abstract void addSettings(BookSettings s) throws IOException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java index b0cfc09893bc..faa9dc7c7352 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java @@ -651,10 +651,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, } } - - // for (int j = 0; j < colsRepeated; j++) { - - if (tableValueTypeNode != null) { // Make sure we initialize to 0 the width of the current cell @@ -858,7 +854,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, } String s = buffer.toString(); - // displayWidth = calculateContentWidth(s); addCell(s); } @@ -960,8 +955,6 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, String s = child.getNodeValue(); - // displayWidth = calculateContentWidth(s); - int k = s.lastIndexOf("."); if (k > 0) { s = s.substring(k+1); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java index e118cc690ea0..55a804cbe33f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java @@ -41,7 +41,6 @@ import org.openoffice.xmerge.ConvertData; import org.openoffice.xmerge.ConvertException; import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.converter.dom.DOMDocument; -//import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.util.Debug; import org.openoffice.xmerge.util.registry.ConverterInfo; @@ -50,7 +49,6 @@ import org.openoffice.xmerge.util.registry.ConverterInfo; import javax.xml.transform.TransformerFactory; import javax.xml.transform.Transformer; import javax.xml.transform.dom.DOMSource; -//import javax.xml.transform.dom.DOMResult; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.stream.StreamResult; @@ -58,12 +56,6 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.transform.URIResolver; import javax.xml.transform.Source; - -// -//import org.apache.xalan.serialize.Serializer; -//import org.apache.xalan.serialize.SerializerFactory; -//import org.apache.xalan.templates.OutputProperties; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -150,14 +142,12 @@ public final class DocumentDeserializerImpl public Source resolve(String href,String base) throws TransformerException{ - //System.out.println("\nhref "+href+"\nbase "+base); if (href !=null){ if(href.equals("javax.xml.transform.dom.DOMSource")|| href.equals("")) return null; try{ ConverterInfo ci = pluginFactory.getConverterInfo(); String newhRef ="jar:"+ci.getJarName()+"!/"+href; - //System.out.println("\n Looking For "+ newhRef); StreamSource sheetFile= new StreamSource(newhRef); return sheetFile; } @@ -215,13 +205,6 @@ public final class DocumentDeserializerImpl tFactory.setURIResolver(this); Transformer transformer = tFactory.newTransformer(xslDomSource); transformer.transform(xmlDomSource,new StreamResult(baos)); - /* - // Serialize for output to standard out - Serializer serializer = SerializerFactory.getSerializer - (OutputProperties.getDefaultMethodProperties("xml")); - serializer.setOutputStream(System.out); - serializer.asDOMSerializer().serialize(xmlDomResult.getNode()); - */ log("\n** Transform Complete ***"); @@ -231,7 +214,7 @@ public final class DocumentDeserializerImpl throw sOE; } catch(Exception e){ - System.out.println("An error occured in the transformation : "+e); + System.out.println("An error occurred in the transformation : "+e); } return baos; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java index 5bf8d4983da1..3dc8434b2508 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java @@ -197,14 +197,12 @@ public final class DocumentSerializerImpl public Source resolve(String href,String base) throws TransformerException{ - //System.out.println("\nhref "+href+"\nbase "+base); if (href !=null){ if(href.equals("javax.xml.transform.dom.DOMSource")|| href.equals("")) return null; try{ ConverterInfo ci = pluginFactory.getConverterInfo(); String newhRef ="jar:"+ci.getJarName()+"!/"+href; - //System.out.println("\n Looking For "+ newhRef); StreamSource sheetFile= new StreamSource(newhRef); return sheetFile; } @@ -235,9 +233,7 @@ public final class DocumentSerializerImpl private ByteArrayOutputStream transform(org.w3c.dom.Document domDoc) throws TransformerException,TransformerConfigurationException , FileNotFoundException,IOException{ - //System.out.println("\nTransforming..."); ConverterInfo ci = pluginFactory.getConverterInfo(); - //DOMResult xmlDomResult = new DOMResult(); ByteArrayOutputStream baos= new ByteArrayOutputStream(); try{ @@ -256,7 +252,6 @@ public final class DocumentSerializerImpl } else{ - //System.out.println(ci.getJarName()+"!/"+ci.getXsltSerial()); xslDoc = dBuilder.parse( "jar:"+ci.getJarName()+"!/"+ci.getXsltSerial()); } @@ -270,24 +265,9 @@ public final class DocumentSerializerImpl Transformer transformer = tFactory.newTransformer(xslDomSource); transformer.transform(xmlDomSource, new StreamResult(baos)); - - /* - transformer.transform(xmlDomSource, xmlDomResult); //Removed this impl because the DocType was not being written out - - // Serialize for output to standard out - Serializer serializer = SerializerFactory.getSerializer - (OutputProperties.getDefaultMethodProperties("xml")); - //serializer.setOutputStream(System.out); - serializer.setOutputStream(baos); - serializer.asDOMSerializer().serialize(xmlDomResult.getNode()); - //serializer.asDOMSerializer().serialize(xmlDomSource.getNode()); - - - //System.out.println("\n** Transform Complete ***"); - */ } catch(Exception e){ - System.out.println("An error occured in the transformation : "+e); + System.out.println("An error occurred in the transformation : "+e); } return baos; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java index 36872751e999..80ddaa1909dc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java @@ -35,8 +35,6 @@ import org.openoffice.xmerge.DocumentDeserializer; import org.openoffice.xmerge.DocumentDeserializerFactory; import org.openoffice.xmerge.PluginFactory; import org.openoffice.xmerge.converter.dom.DOMDocument; -//import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; -//import org.openoffice.xmerge.converter.xml.OfficeDocument; import org.openoffice.xmerge.converter.xml.xslt.GenericOfficeDocument; import org.openoffice.xmerge.util.registry.ConverterInfo; import org.openoffice.xmerge.DocumentMerger; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java index b1d4d5b510fd..afd90733eb68 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java @@ -44,15 +44,12 @@ public interface MergeAlgorithm { * This method is to merge the difference to an <code>Iterator</code>. * The original <code>Iterator</code> will be modified after the call. * - * @param objSeq The original sequence which the difference + * @param orgSeq The original sequence which the difference * will be applied. It will be modified. * @param modSeq The modified sequence where the difference * content will be extracted. * @param differences The <code>Difference</code> array. * - * @return An <code>Iterator</code> which is the modified original - * <code>Iterator</code> Sequence. Same as the first parameter. - * * @throws MergeException If an error occurs during the merge. */ public void applyDifference(Iterator orgSeq, Iterator modSeq, diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java index 9337816c64ab..28a71110b534 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java @@ -47,6 +47,6 @@ public interface NodeMergeAlgorithm { * @param modifyNode The <code>Node</code> to be merged. It may * be modified. */ - public void merge(Node orginialNode, Node modifyNode); + public void merge(Node originalNode, Node modifyNode); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java index 9026303ca3d3..f721fce62258 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java @@ -63,16 +63,10 @@ public class CharArrayLCSAlgorithm { // in those 2 sequences diffTable = createDiffTable(orgSeq, modSeq); - // debug purpose... - // printDiffTable(diffTable); - Vector diffResult = new Vector(); generateResult(diffTable, orgSeqlen, modSeqlen, diffResult); - // don't need anymore if Difference do not contain content information - /* fillInDiffContent(diffResult, orgSeq, modSeq); */ - Difference[] diffArray = new Difference[0]; // convert the vector to array, it has to do in here as diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java index b1da7bcdcdaf..2c5359010276 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java @@ -52,7 +52,7 @@ public final class TextNodeIterator extends NodeIterator { /** * Standard constructor. * - * @param initial The initial root <code>Node</code>. + * @param node The initial root <code>Node</code>. */ public TextNodeIterator(Node node) { super(null, node); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java index f9742c48a743..731fafa8acff 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java @@ -38,7 +38,7 @@ import java.util.Enumeration; * Loads a properties file so that registry knows which plug-ins * it needs to load. * - * @author: Martin Maher + * @author Martin Maher */ public class ConverterInfoList { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java index 33ef294d4ae8..30675c0889d5 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java @@ -112,7 +112,7 @@ public class ColourConverter { * cases where the 16 colour values are something other than there default * values (e.g. in the case of pocket Excel) * - * @param short[] a 16 bit array mapping the 16 colours to there values + * @param lookup a 16 bit array mapping the 16 colours to their values */ public ColourConverter(short lookup[]) { @@ -155,7 +155,7 @@ public class ColourConverter { * This method maps a Pocket Word colour index value to an RGB value as * used by OpenOffice. * - * @param index The index into Pocket Word's colour table. + * @param colour The index into Pocket Word's colour table. * * @return A Color object representing the RGB value of the Pocket Word * colour. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java index 8b9f06eb4e86..7edef508507a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java @@ -269,7 +269,7 @@ public final class Debug { * <p>This logs the message during runtime if debug.info or debug.trace * in the properties file is set to true.</p> * - * @param int Log type, one of the Debug constants + * @param flag Log type, one of the Debug constants * {@link #INFO}, {@link #TRACE}, {@link #ERROR} * or a combination of which or'ed together. * @param msg The message. @@ -291,7 +291,7 @@ public final class Debug { * of the exception passed in. Refer to the other log method * for description. * - * @param int Log type, one of the Debug constants + * @param flag Log type, one of the Debug constants * {@link #INFO}, {@link #TRACE}, {@link #ERROR} * or a combination of which or'ed together. * @param msg The message. diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java index 0993924c129f..b94a7085724c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java @@ -37,7 +37,7 @@ import java.io.*; * manager can exist at a time. It is final, so it may not be * subclassed. * - * @author: Brian Cameron + * @author Brian Cameron */ public final class ConverterInfoMgr { @@ -50,15 +50,13 @@ public final class ConverterInfoMgr { converterInfoList = new Vector(); } - /** * Adds a converter plug-in to the registry. The * <code>ConverterInfo</code> must have a unique DisplayName * and must have non-null values for DisplayName, ClassImpl, * OfficeMime, and DeviceMime. * - * @param ConverterInfo A <code>ConverterInfo</code> object - * describing a plug-in. + * @param ci A <code>ConverterInfo</code> object describing a plug-in. * * @throws RegistryException If the <code>ConverterInfo</code> * is not valid. @@ -111,14 +109,13 @@ public final class ConverterInfoMgr { } } - /** - * Adds a <code>Vector</code> of converter plug-ins to the registry. - * Each <code>ConverterInfo</code> in the <code>Vector</code> must have + * Adds a list of converter plug-ins to the registry. + * Each <code>ConverterInfo</code> in the list must have * a unique DisplayName and must have non-null values for DisplayName, * ClassImpl, OfficeMime, and DeviceMime. * - * @param ciVectory A <code>Vector</code> of <code>ConverterInfo</code> + * @param jarEnum An <code>Enumeration</code> of <code>ConverterInfo</code> * objects describing one or more plug-in(s). * * @throws RegistryException If a <code>ConverterInfo</code> in the @@ -132,7 +129,6 @@ public final class ConverterInfoMgr { } } - /** * Returns an <code>Enumeration</code> of registered * <code>ConverterInfo</code> objects. @@ -145,7 +141,6 @@ public final class ConverterInfoMgr { return (converterInfoList.elements()); } - /** * Removes any <code>ConverterInfo</code> object from the registry * that have the specified jar name value. @@ -183,7 +178,6 @@ public final class ConverterInfoMgr { return rc; } - /** * Removes any <code>ConverterInfo</code> object from the registry * that have the specified display name value. @@ -210,7 +204,6 @@ public final class ConverterInfoMgr { return rc; } - /** * Returns the <code>ConverterInfo</code> object that supports * the specified device/office mime type conversion. If there @@ -254,15 +247,14 @@ public final class ConverterInfoMgr { return null; } - /** * Returns an array of two <code>ConverterInfo</code> objects that * can be chained to perform the specified mime type conversion. * If there are multiple <code>ConverterInfo</code> objects that * support this conversion, only the first is returned. * - * @param deviceMimeFrom The device from mime. - * @param deviceMimeTo The device to mime. + * @param deviceFromMime The device from mime. + * @param deviceToMime The device to mime. * * @return An array of two <code>ConverterInfo</code> objects * that can be chained to perform the specified @@ -323,7 +315,6 @@ public final class ConverterInfoMgr { return null; } - /** * main to let the user specify what plug-ins to register from * jarfiles and to display the currently registered plug-ins. @@ -533,4 +524,3 @@ public final class ConverterInfoMgr { } } } - diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java index 238fd59f9608..b254e6873edd 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java @@ -232,9 +232,6 @@ public class ConverterInfoReader { desc, version, vendor,classImpl, xsltSerial,xsltDeserial); } - /*ConverterInfo converterInfo = new ConverterInfo(jarfilename, - officeMime, deviceMime, name, desc, version, vendor, - classImpl);*/ converterInfoList.add(converterInfo); } |