diff options
| author | José Guilherme Vanz <guilherme.sft@gmail.com> | 2012-10-01 19:57:16 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-10-01 19:58:22 +0200 |
| commit | 78272699f3fdad03c960b4888452ddb7049e24fe (patch) | |
| tree | 1a420cddbf0e8c396826c05a015c899680df8820 /wizards/com/sun/star | |
| parent | f3f706274172879324884e845629ef74b2e2e443 (diff) | |
fdo#51304: Java author and commented code removal.
This patch removes '@author' annotation, code in comments
and adjust some empty catches. It's cleanup patch
Change-Id: Ia0e61765dd06a61bae5419e5f723232f7711044c
Diffstat (limited to 'wizards/com/sun/star')
102 files changed, 16 insertions, 1160 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 5e810e34bd11..6be8215f8498 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -18,8 +18,6 @@ package com.sun.star.wizards.agenda; import java.util.*; - - import com.sun.star.awt.TextEvent; import com.sun.star.beans.PropertyValue; import com.sun.star.container.NoSuchElementException; @@ -538,9 +536,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data drawTopicConstants(); _allItems.clear(); - //_allItems = null; constItems.clear(); - //constItems = null; } /** @@ -584,7 +580,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data } } } -// private void initializeConstantTitles() { XTextRange item = null; @@ -667,7 +662,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data trDeadline = item; constItems.remove(i--); } -// } } @@ -994,7 +988,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data for (int i = 0; i < allSections.length; i++) { Object section = getSection(allSections[i]); - //Try3.showProps(section); boolean visible = ((Boolean) Helper.getUnoPropertyValue(section, "IsVisible")).booleanValue(); if (!visible) { @@ -1384,8 +1377,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data * since there is anyway only one instance of this class at runtime * it could have also be implemented in the AgendaTemplate class * but for clarity and separation I decided to make a sub class for it. - * - * @author rp143992 */ public class Topics { @@ -1884,7 +1875,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data public static void removeTableRows(Object table, int start, int count) { XTableRows rows = UnoRuntime.queryInterface(XTextTable.class, table).getRows(); - //rows.removeByIndex(start, count); } /** @@ -1948,8 +1938,6 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data */ /** * Interface that is used for writing content to a Uno Text / TextRange - * @author rp143992 - * */ interface AgendaElement { @@ -1966,7 +1954,6 @@ interface AgendaElement /** * Basic implementation of the AgendaElement interface - * writes nothing, but applies a ParaStyle to the given XText/XTextRange - * @author rp143992 * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates @@ -2010,7 +1997,6 @@ class ParaStyled implements AgendaElement * A basic implementation of AgendaElement: * writes a String to the given XText/XTextRange, and applies * a ParaStyle to it (using the parent class). - * @author rp143992 */ class TextElement extends ParaStyled { @@ -2041,7 +2027,6 @@ class TextElement extends ParaStyled /** * A Text element which, if the text to write is empty (null or PropertyNames.EMPTY_STRING) * inserts a placeholder instead. - * @author rp143992 * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates @@ -2096,7 +2081,6 @@ class PlaceholderTextElement extends TextElement /** * An Agenda element which writes no text, but inserts a placeholder, and formats * it using a ParaStyleName. - * @author rp143992 * */ class PlaceholderElement extends ParaStyled @@ -2141,7 +2125,6 @@ class PlaceholderElement extends ParaStyled * gets as a parameter a table cursor, and writes * a text to the cell marked by this table cursor, and * a place holder to the next cell. - * @author rp143992 * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index 33924bee21bb..adab22a168a9 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -57,7 +57,6 @@ import com.sun.star.uno.XInterface; * there is not much business logic here - but mostley * event methods. * Some event methods are also implemented in TopicsControl and TopicsControl.ControlRow. - * @author rp143992 */ public class AgendaWizardDialogImpl extends AgendaWizardDialog { @@ -238,7 +237,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog setControlProperty("listPageDesign", PropertyNames.STRING_ITEM_LIST, agendaTemplates[0]); checkSavePath(); - //setFilename(agenda.cp_TemplatePath); UnoDataAware.attachListBox( agenda, "cp_AgendaType", listPageDesign , null, true ).updateUI(); UnoDataAware.attachCheckBox( agenda, "cp_IncludeMinutes", chkMinutes, null, true).updateUI(); @@ -289,16 +287,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog } - /* - private void initializePaths() { - try { - - sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user"); - sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap"); - } catch (NoValidPathException e) { - e.printStackTrace(); - } - }*/ /** * read the available agenda wizard templates. @@ -309,7 +297,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xPathInterface); sTemplatePath = ((String[]) xPropertySet.getPropertyValue("Template_user"))[0]; - //sCurrentNorm = Norms[getCurrentLetter().cp_Norm]; String sAgendaPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../common/wizard/agenda" ); agendaTemplates = FileAccess.getFolderTitles(xMSF, "aw" , sAgendaPath); @@ -482,7 +469,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false ); } catch (Exception e) { SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "ErrorBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate); - //e.printStackTrace(); } if (bSaveSuccess) { @@ -515,11 +501,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog * } */ - //xWindow.setVisible(false); - //running = false; agendaTemplate.xTextDocument.unlockControllers(); - //closeDocument(); - //removeTerminateListener(); PropertyValue loadValues[] = new PropertyValue[2]; loadValues[0] = new PropertyValue(); @@ -534,10 +516,8 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog try { loadValues[1].Value = UnoRuntime.queryInterface(XInteractionHandler.class, xMSF.createInstance("com.sun.star.comp.uui.UUIInteractionHandler")); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } - //Object oDoc = OfficeDocument.load(Desktop.getDesktop(xMSF), agenda.cp_TemplatePath, "_default", new PropertyValue[0]); Object oDoc = OfficeDocument.load(Desktop.getDesktop(xMSF), sPath, "_default", new PropertyValue[0]); xTextDocument = (com.sun.star.text.XTextDocument) oDoc; XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); @@ -559,7 +539,6 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog private void closeDocument() { try { - //xComponent.dispose(); XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, agendaTemplate.xFrame); xCloseable.close(false); } catch (CloseVetoException e) { diff --git a/wizards/com/sun/star/wizards/agenda/TemplateConsts.java b/wizards/com/sun/star/wizards/agenda/TemplateConsts.java index e96edf274560..c2d5b7071f05 100644 --- a/wizards/com/sun/star/wizards/agenda/TemplateConsts.java +++ b/wizards/com/sun/star/wizards/agenda/TemplateConsts.java @@ -17,10 +17,6 @@ */ package com.sun.star.wizards.agenda; -/** - * @author rpiterman - * - */ public interface TemplateConsts { @@ -135,7 +131,6 @@ public interface TemplateConsts public final static String FILLIN_MINUTE_RESPONSIBLE = "<mresponsible>"; public final static String FILLIN_MINUTE_TIME = "<mtime>"; -// public final static String FILLIN_DATETITLE = "#datetitle#"; public final static String FILLIN_TIMETITLE = "#timetitle#"; public final static String FILLIN_LOCATIONTITLE = "#locationtitle#"; @@ -151,5 +146,4 @@ public interface TemplateConsts public final static String FILLIN_TO_DO = "#to-do#"; public final static String FILLIN_RESPONSIBLE_PARTY = "#responsible-party#"; public final static String FILLIN_DEADLINE = "#deadline#"; -// } diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index 975217b3eee6..4a72e26d89c9 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -44,7 +44,6 @@ import com.sun.star.wizards.ui.event.EventNames; import com.sun.star.wizards.ui.event.MethodInvocation; /** - * @author rpiterman * This class implements the UI functionality of the topics scroller control. * <br/> * During developement, there has been a few changes which were not *fully* done - @@ -1083,8 +1082,6 @@ public class TopicsControl extends ControlScroller implements XFocusListener }; /** - * - * @author rp143992 * A class represting a single GUI row. * Note that the instance methods of this class * are being called and handle controls of diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.java b/wizards/com/sun/star/wizards/common/ConfigNode.java index c9704e2c5a5c..593cb9d27d78 100644 --- a/wizards/com/sun/star/wizards/common/ConfigNode.java +++ b/wizards/com/sun/star/wizards/common/ConfigNode.java @@ -23,7 +23,6 @@ package com.sun.star.wizards.common; * OO Configuration. <br/> * There are 2 direct implementations: ConfigGroup and ConfigSet. * The root is the first Java Object in the configuration hirarchie. - * @author rpiterman */ public interface ConfigNode { diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java b/wizards/com/sun/star/wizards/common/ConfigSet.java index 5266c694e2b2..64e15f72b224 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.java +++ b/wizards/com/sun/star/wizards/common/ConfigSet.java @@ -25,10 +25,6 @@ import javax.swing.event.ListDataEvent; import org.w3c.dom.*; -/** - * - * @author rpiterman - */ public class ConfigSet implements ConfigNode, XMLProvider, ListModel { diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index da18fdc7b72a..fdf882b762d7 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -38,7 +38,6 @@ import com.sun.star.util.XChangesBatch; * NOTE: not yet supported, but sometime later, * If you will ommit the "parent" parameter, then the "name" parameter must be in hierarchy form from * the root of the registry. - * @author rpiterman */ public abstract class Configuration { @@ -220,8 +219,6 @@ public abstract class Configuration public static Locale getOfficeLocale(XMultiServiceFactory xMSF) { Locale aLocLocale = new Locale(); - // Object oMasterKey = getConfigurationRoot(xMSF, "org.openoffice.Setup/L10N/", false); - // String sLocale = (String) Helper.getUnoObjectbyName(oMasterKey, "ooLocale"); String sLocale = getOfficeLocaleString(xMSF); String[] sLocaleList = JavaTools.ArrayoutofString(sLocale, "-"); aLocLocale.Language = sLocaleList[0]; @@ -272,9 +269,6 @@ public abstract class Configuration else { - /*if (xNameContainer.hasByName(name)) - xNameContainer.removeByName(name);*/ - // create a new detached set element (instance of DataSourceDescription) XSingleServiceFactory xElementFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, configView); diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.java b/wizards/com/sun/star/wizards/common/DebugHelper.java index c89da38800c0..16c39fb53286 100644 --- a/wizards/com/sun/star/wizards/common/DebugHelper.java +++ b/wizards/com/sun/star/wizards/common/DebugHelper.java @@ -19,13 +19,9 @@ package com.sun.star.wizards.common; import com.sun.star.uno.Exception; -/** - * - * @author ll93751 - */ public class DebugHelper { - +//TODO - Verify these methods. Can not remove? public static void exception(String DetailedMessage, Exception ex, int err, String additionalArgument) throws java.lang.Exception { // throw new UnsupportedOperationException("Not supported yet."); diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index 1a0637430a9a..f089350c2878 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -17,14 +17,7 @@ */ package com.sun.star.wizards.common; -// import java.util.Date; - -// import com.sun.star.awt.XToolkit; import com.sun.star.beans.PropertyValue; -// import com.sun.star.frame.XDesktop; -// import com.sun.star.frame.XFrame; -// import com.sun.star.frame.XFramesSupplier; - import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiComponentFactory; @@ -347,8 +340,6 @@ public class Desktop /** * @deprecated used to retrieve the most common paths used in the office application - * @author bc93774 - * */ public class OfficePathRetriever { diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 46e4f8a55fb9..dfb5d68b7bc4 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet; import com.sun.star.lang.Locale; import com.sun.star.uno.Exception; import com.sun.star.util.XMacroExpander; -// import com.sun.star.wizards.common.NoValidPathException; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +29,6 @@ import java.util.Vector; import com.sun.star.awt.VclWindowPeerAttribute; import com.sun.star.io.XActiveDataSink; import com.sun.star.io.XInputStream; -// import com.sun.star.io.XStream; import com.sun.star.io.XTextInputStream; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.ucb.*; @@ -69,7 +67,6 @@ public class FileAccess String[] PathList = JavaTools.ArrayoutofString(ResultPath, PropertyNames.SEMI_COLON); int MaxIndex = PathList.length - 1; String CompCurPath; - // sAddPath.replace(null, (char) 47); String CompAddPath = JavaTools.replaceSubString(sAddPath, PropertyNames.EMPTY_STRING, "/"); String CurPath; for (int i = 0; i <= MaxIndex; i++) @@ -208,28 +205,19 @@ public class FileAccess { //This method currently only works with sPath="Template" - // String ResultPath = PropertyNames.EMPTY_STRING; ArrayList<String> aPathList = new ArrayList<String>(); String Template_writable = PropertyNames.EMPTY_STRING; String[] Template_internal; String[] Template_user; - // String [] ReadPaths = null; - - // boolean bexists = false; try { XInterface xPathInterface = (XInterface) xMSF.createInstance("com.sun.star.util.PathSettings"); XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xPathInterface); - // String WritePath = PropertyNames.EMPTY_STRING; - // XInterface xUcbInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); - // XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, xUcbInterface); - Template_writable = (String) xPropertySet.getPropertyValue(_sPath + "_writable"); Template_internal = (String[]) xPropertySet.getPropertyValue(_sPath + "_internal"); Template_user = (String[]) xPropertySet.getPropertyValue(_sPath + "_user"); - // int iNumEntries = Template_user.length + Template_internal.length + 1; for (int i = 0; i < Template_internal.length; i++) { String sPath = Template_internal[i]; @@ -248,41 +236,12 @@ public class FileAccess } aPathList.addAll(Arrays.asList(Template_user)); aPathList.add(Template_writable); - // WritePath = Template_writable; - -// if (sType.equalsIgnoreCase("user")) -// { -// ResultPath = WritePath; -// bexists = true; -// } - // There was a bug here, because we have to search through the whole list of paths -// else -// { -// //find right path using the search sub path -// for (int i = 0; i<ReadPaths.length; i++) -// { -// String tmpPath = ReadPaths[i]+sSearchDir; -// if (xSimpleFileAccess.exists(tmpPath)) -// { -// ResultPath = ReadPaths[i]; -// bexists = true; -// break; -// } -// } -// } -// ResultPath = deleteLastSlashfromUrl(ResultPath); } catch (Exception exception) { exception.printStackTrace(System.err); - // ResultPath = PropertyNames.EMPTY_STRING; } -// if (bexists == false) -// { -// throw new NoValidPathException(xMSF, PropertyNames.EMPTY_STRING); -// } -// return ResultPath; return aPathList; } @@ -350,8 +309,6 @@ public class FileAccess return sPath; } - // java.util.Locale jl = new java.util.Locale( - // l.Language , l.Country, l.Variant ); } catch (com.sun.star.uno.Exception e) { @@ -360,48 +317,6 @@ public class FileAccess return _sPath; } - /* - public static String getOfficePath(XMultiServiceFactory xMSF, String sPath, String sType) throws NoValidPathException { - String ResultPath = PropertyNames.EMPTY_STRING; - Object oPathSettings; - int iPathCount; - String[] PathList; - boolean bexists = false; - try { - XInterface xUcbInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); - XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, xUcbInterface); - ResultPath = getOfficePath(xMSF, sPath, xSimpleFileAccess); - PathList = JavaTools.ArrayoutofString(ResultPath, PropertyNames.SEMI_COLON); - if (!sType.equals(PropertyNames.EMPTY_STRING)) { - ResultPath = PropertyNames.EMPTY_STRING; - String CurPath = PropertyNames.EMPTY_STRING; - String EndString = "/" + sType; - int EndLength = EndString.length(); - sType = "/" + sType + "/"; - int MaxIndex = PathList.length - 1; - int iPos; - for (int i = 0; i <= MaxIndex; i++) { - CurPath = PathList[i]; - iPos = CurPath.length() - EndLength; - if ((CurPath.indexOf(sType) > 0) || (CurPath.indexOf(EndString) == iPos)) { - ResultPath = deleteLastSlashfromUrl(CurPath); - if (xSimpleFileAccess.exists(ResultPath)) - break; - } - } - } else - ResultPath = PathList[0]; - if (ResultPath.equals(PropertyNames.EMPTY_STRING) == false) - bexists = xSimpleFileAccess.exists(ResultPath); - } catch (Exception exception) { - exception.printStackTrace(System.err); - ResultPath = PropertyNames.EMPTY_STRING; - } - if (bexists == false) - throw new NoValidPathException(xMSF); - return ResultPath; - } - **/ public static void combinePaths(XMultiServiceFactory xMSF, ArrayList<String> _aFirstPath, String _sSecondPath) throws NoValidPathException { for (int i = 0; i < _aFirstPath.size(); ++i) @@ -588,7 +503,7 @@ public class FileAccess */ public static String[][] getFolderTitles(com.sun.star.lang.XMultiServiceFactory xMSF, String FilterName, String FolderName) { - String[][] LocLayoutFiles = new String[2][]; //{PropertyNames.EMPTY_STRING,PropertyNames.EMPTY_STRING}{PropertyNames.EMPTY_STRING}; + String[][] LocLayoutFiles = new String[2][]; try { java.util.Vector<String> TitleVector = null; @@ -716,7 +631,7 @@ public class FileAccess public static String[][] getFolderTitles(com.sun.star.lang.XMultiServiceFactory xMSF, String _sStartFilterName, ArrayList<String> FolderName, String _sEndFilterName) throws NoValidPathException { - String[][] LocLayoutFiles = new String[2][]; //{PropertyNames.EMPTY_STRING,PropertyNames.EMPTY_STRING}{PropertyNames.EMPTY_STRING}; + String[][] LocLayoutFiles = new String[2][]; if (FolderName.size() == 0) { throw new NoValidPathException(null, "Path not given."); @@ -827,7 +742,6 @@ public class FileAccess } /** - * @author rpiterman * @param filename * @return the extension of the given filename. */ @@ -850,7 +764,6 @@ public class FileAccess } /** - * @author rpiterman * @param s * @return */ @@ -873,7 +786,6 @@ public class FileAccess } /** - * @author rpiterman * @param filename * @param def what to return in case of an exception * @return true if the given file exists or not. @@ -896,7 +808,6 @@ public class FileAccess } /** - * @author rpiterman * @param filename * @return */ @@ -918,7 +829,6 @@ public class FileAccess /** * lists the files in a given directory - * @author rpiterman * @param dir * @param includeFolders * @return @@ -940,7 +850,6 @@ public class FileAccess } /** - * @author rpiterman * @param file * @return */ @@ -964,7 +873,6 @@ public class FileAccess } /** - * @author rpiterman * @param path * @return */ @@ -984,7 +892,6 @@ public class FileAccess } /** - * @author rpiterman * @param path * @param pathSeparator * @return @@ -1003,7 +910,6 @@ public class FileAccess } /** - * @author rpiterman * @param source * @param target * @return @@ -1041,7 +947,6 @@ public class FileAccess } /** - * * @param url * @return the parent dir of the given url. * if the path points to file, gives the directory in which the file is. diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index 9a50753c0050..429bc6a9398b 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -24,10 +24,8 @@ import java.util.Calendar; import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; -// import com.sun.star.i18n.NumberFormatIndex; import com.sun.star.lang.Locale; import com.sun.star.lang.XMultiServiceFactory; -// import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.RuntimeException; import com.sun.star.uno.UnoRuntime; @@ -153,7 +151,6 @@ public class Helper } } } - // System.out.println("Property not found: " + PropertyName); return null; } @@ -176,7 +173,6 @@ public class Helper } } } - // System.out.println("Property not found: " + PropertyName); return null; } catch (Exception exception) @@ -193,7 +189,6 @@ public class Helper if (oUnoObject != null) { XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, oUnoObject); - // Property[] aProps = xPSet.getPropertySetInfo().getProperties(); return xPSet.getPropertyValue(PropertyName); } } @@ -259,7 +254,6 @@ public class Helper { for (int i = 0; i < PropertyNames.length; i++) { - //System.out.println(PropertyNames[i] + "=" + PropertyValues[i]); setUnoPropertyValue(oUnoObject, PropertyNames[i], PropertyValues[i]); } } @@ -271,7 +265,6 @@ public class Helper } /** - * @author bc93774 * checks if the value of an object that represents an array is null. * check beforehand if the Object is really an array with "AnyConverter.IsArray(oObject) * @param oValue the paramter that has to represent an object diff --git a/wizards/com/sun/star/wizards/common/Indexable.java b/wizards/com/sun/star/wizards/common/Indexable.java index c2b27fe978fe..b20fd174c7f6 100644 --- a/wizards/com/sun/star/wizards/common/Indexable.java +++ b/wizards/com/sun/star/wizards/common/Indexable.java @@ -23,10 +23,6 @@ package com.sun.star.wizards.common; -/** - * - * @author rpiterman - */ public interface Indexable { public int getIndex(); diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index aaaf2dcae87f..f13120666850 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -26,10 +26,6 @@ import com.sun.star.lib.util.UrlToFileMapper; import java.net.MalformedURLException; import java.net.URL; -/** - * - * @author bc93774 - */ public class JavaTools { @@ -38,31 +34,6 @@ public class JavaTools { } -/* - public static void main(String args[]) - { - String sPath = PropertyNames.EMPTY_STRING; - DateTime oDateTime = null; - long n; - String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; //localhost ;Lo-1.Germany.sun.com; 10.16.65.155 - try - { - XMultiServiceFactory xLocMSF = com.sun.star.wizards.common.Desktop.connect(ConnectStr); - if (xLocMSF != null) - { - System.out.println("Connected to " + ConnectStr); - oDateTime = getDateTime(9500000); - sPath = convertfromURLNotation("file:///E:/trash/Web%20Wizard.xcu"); - n = getMillis(oDateTime); - int a = 1; - } - } - catch (Exception exception) - { - exception.printStackTrace(System.err); - } - } -*/ public static String[] copyStringArray(String[] FirstArray) { if (FirstArray != null) @@ -218,7 +189,6 @@ public class JavaTools } /** - * @author bc93774 * @param SearchList * @param SearchString * @return the index of the field that contains the string 'SearchString' or '-1' if not it is @@ -327,7 +297,6 @@ public class JavaTools } /** - * @author bc93774 * This function bubble sorts an array of with 2 dimensions. * The default sorting order is the first dimension * Only if sort2ndValue is True the second dimension is the relevant for the sorting order @@ -496,17 +465,12 @@ public class JavaTools if ((baselist != null) && (_complist != null)) { ArrayList<String> retvector = new ArrayList<String>(); -// String[] orderedcomplist = new String[_complist.length]; -// System.arraycopy(_complist, 0, orderedcomplist, 0, _complist.length); for (int i = 0; i < baselist.length; i++) -// if (Arrays.binarySearch(orderedcomplist, baselist[i]) != -1) { if (FieldInList(_complist, baselist[i]) > -1) { retvector.add(baselist[i]); - // else // here you could call the method of a defined interface to notify the calling method - // } } } retarray = new String[retvector.size()]; @@ -529,7 +493,6 @@ public class JavaTools if (FieldInList(_complist, sValue) != -1) { retvector.add(baselist[i]); - // else // here you could call the method of a defined interface to notify the calling method } } diff --git a/wizards/com/sun/star/wizards/common/NamedValueCollection.java b/wizards/com/sun/star/wizards/common/NamedValueCollection.java index 30d06ec1fa53..2813b22647ea 100644 --- a/wizards/com/sun/star/wizards/common/NamedValueCollection.java +++ b/wizards/com/sun/star/wizards/common/NamedValueCollection.java @@ -26,10 +26,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -/** - * - * @author frank.schoenheit@sun.com - */ public class NamedValueCollection { final private HashMap< String, Object > m_values = new HashMap< String, Object >(); diff --git a/wizards/com/sun/star/wizards/common/Properties.java b/wizards/com/sun/star/wizards/common/Properties.java index 1d310957f58b..4c4a69df044e 100644 --- a/wizards/com/sun/star/wizards/common/Properties.java +++ b/wizards/com/sun/star/wizards/common/Properties.java @@ -31,7 +31,6 @@ import java.util.*; * the put(propName,propValue) method. * caution: propName should always be a String. * When finished, call the getProperties() method to get an array of the set properties. - * @author rp */ public class Properties extends HashMap<String,Object> { diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java b/wizards/com/sun/star/wizards/common/PropertyNames.java index 1f75b2071f04..c851b7432b3b 100644 --- a/wizards/com/sun/star/wizards/common/PropertyNames.java +++ b/wizards/com/sun/star/wizards/common/PropertyNames.java @@ -17,10 +17,6 @@ */ package com.sun.star.wizards.common; -/** - * - * @author Ocke Janssen - */ public class PropertyNames { diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 2c9399b74d4a..f17b8698408e 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -40,7 +40,6 @@ import com.sun.star.ucb.XDynamicResultSet; import com.sun.star.uno.UnoRuntime; /** - * @author rpiterman * This class is used to copy the content of a folder to * another folder. * There is an incosistency with argument order. @@ -100,7 +99,6 @@ public class UCB { fa.fileAccess.createFolder(targetDir); } - //System.out.println("UCB.copy(" + sourceDir + ", " + filename + ", " + targetDir+ ", " + targetName); executeCommand(ucb, "globalTransfer", copyArg(sourceDir,filename, targetDir,targetName)); } @@ -246,7 +244,6 @@ public class UCB public Object getContent(String path) throws Exception { - //System.out.println("Getting Content for : " + path); XContentIdentifier id = UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb).createContentIdentifier(path); return UnoRuntime.queryInterface( diff --git a/wizards/com/sun/star/wizards/common/XMLHelper.java b/wizards/com/sun/star/wizards/common/XMLHelper.java index 9186d800fd95..5a49b288db72 100644 --- a/wizards/com/sun/star/wizards/common/XMLHelper.java +++ b/wizards/com/sun/star/wizards/common/XMLHelper.java @@ -25,10 +25,6 @@ package com.sun.star.wizards.common; import org.w3c.dom.*; -/** - * - * @author rpiterman - */ public class XMLHelper { diff --git a/wizards/com/sun/star/wizards/common/XMLProvider.java b/wizards/com/sun/star/wizards/common/XMLProvider.java index 6558365779aa..063cb7a620a5 100644 --- a/wizards/com/sun/star/wizards/common/XMLProvider.java +++ b/wizards/com/sun/star/wizards/common/XMLProvider.java @@ -25,10 +25,6 @@ package com.sun.star.wizards.common; import org.w3c.dom.Node; -/** - * - * @author rpiterman - */ public interface XMLProvider { diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java index 6d155d0f2c74..96208c89e6a3 100644 --- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java +++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.db; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.PropertyNames; -/** - * - * @author bc93774 - */ public class BlindtextCreator { diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java index 1eb3b12420e2..d8ce52e72487 100644 --- a/wizards/com/sun/star/wizards/db/RelationController.java +++ b/wizards/com/sun/star/wizards/db/RelationController.java @@ -27,8 +27,6 @@ import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.PropertyNames; /** - * @author bc93774 - * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 21f1e7af9526..0a0c5cd2e60f 100644 --- a/wizards/com/sun/star/wizards/document/DatabaseControl.java +++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java @@ -30,8 +30,6 @@ import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.db.FieldColumn; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ @@ -39,14 +37,10 @@ public class DatabaseControl extends Control { private int m_nFieldType; - // private int iMemofieldwidth = IIMGFIELDWIDTH; - // private int iMemofieldheight = -1; - // private FieldColumn m_FieldColumn; public DatabaseControl(GridControl _oGridControl, FieldColumn _curfieldcolumn) { super(); - // m_FieldColumn = _curfieldcolumn; if (_curfieldcolumn.getFieldType() != DataType.TIMESTAMP) { createGridColumn(_oGridControl, _curfieldcolumn, _curfieldcolumn.getFieldType(), _curfieldcolumn.getFieldTitle()); @@ -56,7 +50,6 @@ public class DatabaseControl extends Control public DatabaseControl(GridControl _oGridControl, FieldColumn _curfieldcolumn, int _fieldtype, String _columntitle) { super(); - // m_FieldColumn = _curfieldcolumn; createGridColumn(_oGridControl, _curfieldcolumn, _fieldtype, _columntitle); } @@ -150,14 +143,12 @@ public class DatabaseControl extends Control { if (getControlType() == FormHandler.SOIMAGECONTROL) { - // return oFormHandler.getImageControlHeight(); return oFormHandler.getControlReferenceHeight() * 4; } else { if (getFieldType() == DataType.LONGVARCHAR) { - // Helper.setUnoPropertyValue(xControlModel, PropertyNames.PROPERTY_MULTILINE, Boolean.TRUE); return oFormHandler.getControlReferenceHeight() * 4; } else if (getControlType() == FormHandler.SOCHECKBOX) @@ -199,21 +190,6 @@ public class DatabaseControl extends Control if (getControlType() == FormHandler.SONUMERICCONTROL) { xPropertySet.setPropertyValue("TreatAsNumber", Boolean.TRUE); - // Math. - // 2^63 - 1 = 9223372036854775807 - // int nIntMax = 0x7fffffff; - // int nIntMin = -0x80000000; - // long nLongMax = nIntMax; - // nLongMax <<= (4*4); - // nLongMax |= 0xffff; - // nLongMax <<= (4*4); - // nLongMax |= 0xffff; - - // long nLongMin = nIntMin; - // nLongMin <<= (8*4); - - // long nLong2 = (long)9223372036854775807; - switch (getFieldType()) { case DataType.BIGINT: @@ -240,9 +216,6 @@ public class DatabaseControl extends Control break; } } - // else if (getControlType() == FormHandler.SOTEXTBOX) - // { // com.sun.star.sdbc.DataType.CHAR, com.sun.star.sdbc.DataType.VARCHAR, com.sun.star.sdbc.DataType.LONGVARCHAR - // } else if (getControlType() == FormHandler.SOIMAGECONTROL) { xPropertySet.setPropertyValue("ScaleMode", com.sun.star.awt.ImageScaleMode.Isotropic); diff --git a/wizards/com/sun/star/wizards/document/Shape.java b/wizards/com/sun/star/wizards/document/Shape.java index bbb793285af3..93f0606a4207 100644 --- a/wizards/com/sun/star/wizards/document/Shape.java +++ b/wizards/com/sun/star/wizards/document/Shape.java @@ -31,8 +31,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index aac5951610a3..bc372e2e7913 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -30,8 +30,6 @@ import com.sun.star.wizards.ui.WizardDialog; import com.sun.star.wizards.db.RelationController; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ @@ -124,10 +122,6 @@ public class FormConfiguration CurUnoDialog.insertInfoImage(97, 120, ISubFormStep.intValue()); } - // public void disableSubFormCheckBox() - // { - // Helper.setUnoPropertyValue(UnoDialog.getModel(chkcreateSubForm), PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); - // } public RelationController getRelationController() { diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index e25cb8ec52d4..5ddd437aceb7 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -26,7 +26,6 @@ import com.sun.star.wizards.common.PropertyNames; /** This class capsulates the class, that implements the minimal component, a * factory for creating the service (<CODE>__getServiceFactory</CODE>). - * @author Bertram Nolte */ public class CallQueryWizard { @@ -57,10 +56,8 @@ public class CallQueryWizard public static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; - // <properties> public String Command; public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY; - // </properties> /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param i_serviceFactory A special service factory could be introduced while initializing. diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java index d64468a4cdb4..4f284a06a989 100644 --- a/wizards/com/sun/star/wizards/report/CallReportWizard.java +++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java @@ -29,34 +29,12 @@ import java.util.logging.Logger; /** This class capsulates the class, that implements the minimal component, a * factory for creating the service (<CODE>__getServiceFactory</CODE>). - * @author Bertram Nolte */ public class CallReportWizard { static boolean bWizardstartedalready; -/* public static void main(String args[]) - { - String ConnectStr = "uno:pipe,name=fs93730;urp;StarOffice.ServiceManager"; - try - { - XMultiServiceFactory orb = Desktop.connect(ConnectStr); - if ( orb != null ) - { - PropertyValue[] curproperties = new PropertyValue[1]; - curproperties[0] = Properties.createProperty("DataSourceName", "countries"); - - ReportWizard wizard = new ReportWizard( orb, curproperties ); - wizard.startReportWizard(); - } - } - catch (java.lang.Exception jexception) - { - jexception.printStackTrace(System.err); - } - }*/ - /** Gives a factory for creating the service. * This method is called by the <code>JavaLoader</code> * <p> @@ -152,7 +130,6 @@ public class CallReportWizard { this.m_wizardContext = Properties.convertToPropertyValueArray(object); - // xmultiservicefactory = (XMultiservicefactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, object[0]); } /** This method returns an array of all supported service names. diff --git a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java index 2381b1b7eda0..3285f65705b6 100644 --- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java @@ -20,7 +20,6 @@ package com.sun.star.wizards.report; /** * This Interface separate the ReportBuilderImplementation from the layout. * Only these less methods are allowed to access from the ReportBuilderImplementation. - * @author ll93751 */ public interface IReportBuilderLayouter { diff --git a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java index cb4e7ae68b4b..b365a06a94bc 100644 --- a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java +++ b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java @@ -24,7 +24,6 @@ import com.sun.star.report.XReportDefinition; * This interface contains only one function to give access to the ReportDefinition. * The ReportDefinition will be initialized very late, late after the ReportLayouters. * So we need this interface for the late access. - * @author ll93751 */ public interface IReportDefinitionReadAccess { diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java index 02c41da4d91e..18e7cfe68310 100644 --- a/wizards/com/sun/star/wizards/report/IReportDocument.java +++ b/wizards/com/sun/star/wizards/report/IReportDocument.java @@ -27,8 +27,6 @@ import java.util.ArrayList; /** * New Interface which gives us the possibility to switch on the fly between the old * Wizard and the new Sun Report Builder Wizard, which use the same UI. - * - * @author ll93751 */ public interface IReportDocument { @@ -121,7 +119,6 @@ public interface IReportDocument public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount); public void refreshGroupFields(String[] _sNewNames); - // public boolean isGroupField(String _FieldName); /** * Called by press ('less then') Removes an already set Groupname out of the list * @param NewSelGroupNames diff --git a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java index 33f49da8e0cc..316007469942 100644 --- a/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java +++ b/wizards/com/sun/star/wizards/report/ReportImplementationHelper.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.report; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.db.RecordParser; -/** - * - * @author ll93751 - */ public class ReportImplementationHelper { @@ -32,7 +28,6 @@ public class ReportImplementationHelper protected int m_nDefaultPageOrientation; /** - * * @param _aMSF * @param _nOrientation */ diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 93f052308fab..9ac60be6c1c7 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -52,10 +52,6 @@ import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; -/** - * - * @author ll93751 - */ public class ReportTextImplementation extends ReportImplementationHelper implements IReportDocument { @@ -334,7 +330,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme DBColumn CurDBColumn; Object CurGroupValue; String CurGroupTableName; -// RecordParser CurDBMetaData = getRecordParser(); getDoc().oTextFieldHandler.fixDateFields(true); getDoc().removeAllVisibleTextSections(); getDoc().removeNonLayoutTextTables(); @@ -365,11 +360,9 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } if (getRecordParser().getcurrentRecordData(DataVector)) { - // int RowIndex = 1; m_bStopProcess = false; while ((getRecordParser().ResultSet.next()) && (!m_bStopProcess)) { - // RowIndex += 1; breset = false; for (ColIndex = 0; ColIndex < GroupFieldCount; ColIndex++) { @@ -385,7 +378,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } } getRecordParser().getcurrentRecordData(DataVector); - // updateProgressDisplay(RowIndex); } insertDataToRecordTable(xTextCursor, DataVector, RecordFieldCount); } @@ -418,10 +410,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { Logger.getLogger( ReportTextImplementation.class.getName() ).log( Level.SEVERE, null, ex ); } -// catch (java.lang.Exception javaexception) -// { -// javaexception.printStackTrace(System.err); -// } getDoc().unlockallControllers(); getDoc().setLayoutSectionsVisible(false); getDoc().removeCopiedTextSections(); @@ -446,22 +434,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } DataVector.clear(); } -// public void updateProgressDisplay(int iCounter) -// { -// try -// { -// if (iCounter % 10 == 0) -// { -// sProgressCurRecord = JavaTools.replaceSubString(sProgressBaseCurRecord, String.valueOf(iCounter), "<COUNT>"); -// setControlProperty("lblCurProgress", PropertyNames.PROPERTY_LABEL, sProgressCurRecord); -// super.xReschedule.reschedule(); -// } -// } -// catch (java.lang.Exception jexception) -// { -// jexception.printStackTrace(System.err); -// } -// } private void replaceUserFields() { DBColumn CurDBColumn; @@ -495,7 +467,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme public void store(String _sName, int _nOpenMode) throws com.sun.star.uno.Exception { getDoc().createReportForm(ReportWizard.SOREPORTFORMNAME); - // int nOpenMode = getReportOpenMode(); getDoc().oTextFieldHandler.updateDateFields(); getDoc().oTextFieldHandler.fixDateFields(false); if ((_nOpenMode == ReportFinalizer.SOCREATETEMPLATE || _nOpenMode == ReportFinalizer.SOUSETEMPLATE)) @@ -515,10 +486,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme getDoc().refreshGroupFields(_sNewNames); } - // public boolean isGroupField(String _FieldName) - // { - // return getDoc().isGroupField(_FieldName); - // } public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector) { getDoc().removeGroupName(NewSelGroupNames, CurGroupTitle, GroupFieldVector); @@ -540,7 +507,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { throw new com.sun.star.lang.IllegalArgumentException("Unknown Orientation."); } - // CurReportDocument.getDoc().unlockallControllers(); } public void liveupdate_changeLayoutTemplate(String LayoutTemplatePath/*, String BitmapPath*/) @@ -636,7 +602,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme try { m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard"); - // m_sReportPath = FileAccess.combinePaths(getMSF(), m_sReportPath, "/wizard/report"); FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report"); } catch (Exception e) @@ -687,7 +652,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme String[][] ContentFiles; try { -// ContentFiles = FileAccess.getFolderTitles(m_xMSF, "cnt", CurReportDocument.getReportPath()); ContentFiles = FileAccess.getFolderTitles(getMSF(), "cnt", getReportPath()); exchangeContentTitlesWithLocalisedOnes(ContentFiles); } @@ -709,7 +673,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme String[][] LayoutFiles; try { -// LayoutFiles = FileAccess.getFolderTitles(m_xMSF, "stl", CurReportDocument.getReportPath()); LayoutFiles = FileAccess.getFolderTitles(getMSF(), "stl", getReportPath()); exchangeLayoutTitlesWithLocalisedOnes(LayoutFiles); } diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index 5ecc5d357f58..3a8e55e637e6 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -61,8 +61,6 @@ import java.util.logging.Logger; /** * This class use the IReportDocument Interface to communicate between the UI * and the ReportBuilderLayouter which communicates to the new Sun Report Builder. - * - * @author ll93751 */ public class ReportBuilderImplementation extends ReportImplementationHelper implements IReportDocument, IReportDefinitionReadAccess @@ -99,7 +97,6 @@ public class ReportBuilderImplementation extends ReportImplementationHelper return UnoRuntime.queryInterface(XWindowPeer.class, getFrame().getComponentWindow()); } private XFrame m_xFrame = null; - // private ReportBuilderLayouter m_aReportBuilderLayouter = null; private String m_sReportBuilderLayoutName = PropertyNames.EMPTY_STRING; /** diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java index 89f155f4a064..ac166083dd9b 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java @@ -23,10 +23,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.UIConsts; -/** - * - * @author ll93751 - */ public class ColumnarSingleColumn extends ReportBuilderLayouter { @@ -59,7 +55,6 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java index ae8ade62e3d2..82281f548be4 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java @@ -21,10 +21,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.*; -/** - * - * @author ll93751 - */ public class ColumnarThreeColumns extends ColumnarTwoColumns { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java index e045b8599a0c..e75eefc21359 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java @@ -23,10 +23,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.UIConsts; -/** - * - * @author ll93751 - */ public class ColumnarTwoColumns extends ReportBuilderLayouter { @@ -68,7 +64,6 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index cecadae008af..c626dcd9c58e 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -18,9 +18,6 @@ package com.sun.star.wizards.reportbuilder.layout; import com.sun.star.beans.PropertyValue; -// import com.sun.star.container.NoSuchElementException; -// import com.sun.star.lang.IndexOutOfBoundsException; -// import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.report.XFixedText; import com.sun.star.report.XFormattedField; @@ -32,10 +29,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.PropertyNames; -/** - * - * @author ll93751 - */ public class DesignTemplate { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index 6f859ef4f88f..00319ce2f856 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java @@ -23,10 +23,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.*; -/** - * - * @author ll93751 - */ public class InBlocksLabelsAbove extends ColumnarTwoColumns { @@ -59,7 +55,6 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); @@ -71,7 +66,6 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns int i = 0; int nCount = aFieldTitleNames.length; - // int x = 0; aRectLabels.Y = 0; aRectLabels.X = getLeftPageIndent() + getLeftGroupIndent(getCountOfGroups()); @@ -83,11 +77,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns int nFieldWidth = 3000; while (nCount > 0) { - // String sLabel = aFieldTitleNames[i]; - // int nLabelWidth = 3000; - // String sFieldName = convertToFieldName(aFieldNames[i]); aRectFields.X += nFieldWidth; - // aRectLabels.X += nFieldWidth; final int nNextX = aRectFields.X + nFieldWidth; if (nNextX > (getPageWidth() - getRightPageIndent())) diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java index 184c1b7a76c6..f7fef368ab02 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java @@ -24,10 +24,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.*; -/** - * - * @author ll93751 - */ public class InBlocksLabelsLeft extends ColumnarTwoColumns { @@ -60,7 +56,6 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); @@ -82,7 +77,6 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns int i = 0; int nCount = aFieldTitleNames.length; - // int x = 0; aRectLabelFields.Y = 0; aRectLabelFields.X = getLeftPageIndent() + getLeftGroupIndent(getCountOfGroups()); @@ -93,7 +87,6 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns while (nCount > 0) { final String sLabel = aFieldTitleNames[i]; -// nLabelWidth = 3000; aRectLabelFields = insertLabel(xSection, sLabel, aRectLabelFields, nLabelWidth, aSOLabel); final String sFieldName = convertToFieldName(aFieldNames[i]); nFieldWidth = 3000 + nDelta; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java b/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java index cc524769c835..9b294a12da26 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/LayoutConstants.java @@ -18,10 +18,6 @@ package com.sun.star.wizards.reportbuilder.layout; -/** - * - * @author ll93751 - */ public class LayoutConstants { public static final int LabelHeight = 500; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index a697ddea03e4..a7c6b8f44168 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -67,7 +67,6 @@ import java.util.logging.Logger; /** * This class is abstract and more like a helper for create different layouts for Report Builder Wizard. - * @author ll93751 */// TODO: let a little bit place between 2 formatted fields // TODO: move all sectionobjects which have a connect to the right max page width to left if there is a orientation change. abstract public class ReportBuilderLayouter implements IReportBuilderLayouter @@ -84,7 +83,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { closeDesignTemplate(); m_xReportDefinitionReadAccess = null; - // m_xReportBuilderLayouter = null; } /** @@ -144,7 +142,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter int lastGroupPostion = insertGroups(); clearDetails(); - // clearFieldTitles(); insertDetailFieldTitles(lastGroupPostion); insertDetailFields(); } @@ -169,7 +166,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter protected void clearGroups() { final XGroups xGroups = getReportDefinition().getGroups(); -// int nCount = xGroups.getCount(); while (xGroups.hasElements()) { try @@ -194,7 +190,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { return; } - // int nCount = _xSectionToClear.getCount(); while (_xSectionToClear.hasElements()) { try @@ -216,12 +211,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final XSection xSection = getReportDefinition().getDetail(); emptySection(xSection); } -// public void clearFieldTitles() -// { -// } /** - * * @param _nGroupCount * @return the left indent in 1/100mm */ @@ -281,10 +272,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final XNameAccess xNameAccess = getReportDefinition().getStyleFamilies(); try { - // <Analysecode> - // String[] aNames = xNameAccess.getElementNames(); - // </Analysecode> - // get all Page Styles final Object aPageStylesObj = xNameAccess.getByName(_sStyleName); final XNameAccess xContainer = UnoRuntime.queryInterface(XNameAccess.class, aPageStylesObj); @@ -533,7 +520,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter */ protected String[] getNamesWithoutGroupNames(String[] _aList, String[] _aGetResultFrom) { - if (_aList == null /* || _aGetResultsFrom == null */) + if (_aList == null) { return new String[] { @@ -793,12 +780,9 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter || nType == DataType.VARBINARY || nType == DataType.LONGVARBINARY) { - // aField = getMSFofReportDefinition().createInstance("com.sun.star.report.ImageControl"); final XImageControl xImageControl = UnoRuntime.queryInterface(XImageControl.class, xReportControlModel); if (xImageControl != null) { - // xImageControl.setScaleImage(true); - xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.Isotropic); } } @@ -807,10 +791,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter try { xReportControlModel.setParaAdjust(_nAlignment); - // if (nType == DataType.LONGVARCHAR) - // { - // xReportControlModel.??? - // } } catch (com.sun.star.beans.UnknownPropertyException ex) { @@ -851,7 +831,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter m_aCommandType = _aType; m_sTableName = _sTableName; - // getReportDefinition().setCommandType(com.sun.star.sdb.CommandType.TABLE); getReportDefinition().setCommandType(_aType); getReportDefinition().setCommand(_sTableName); } // ------------------------------------------------------------------------- @@ -1025,46 +1004,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } -// protected static String getDateString(String _sFormat) -// { -// GregorianCalendar aCalendar = new GregorianCalendar(); -// StringBuffer aBuf = new StringBuffer(); -// -// Locale aLocale = new Locale("en","US"); -// SimpleDateFormat aFormat = new SimpleDateFormat(_sFormat, aLocale); -// aBuf = aFormat.format(aCalendar.getTime(), aBuf, new FieldPosition(0) ); -// // DebugHelper.writeInfo("Date: " + aBuf.toString()); -// return aBuf.toString(); -// } -// protected String getCurrentDate() -// { -// Calendar aCalendar = Calendar.getInstance(); -//// aCalendar.setTimeInMillis(1202382900000L); -//// aCalendar. -// Date aDate = new Date(); -// String sDate = DateFormat.getDateInstance().format(aDate); -// // String aCalStr = aCalendar.toString(); -// return sDate; -// // -//// Date aDate = new Date(); -//// aDate.setSeconds(0); -//// aDate.setMinutes(15); -//// aDate.setHours(12); -//// // aDate.setMonth(2); -//// // aDate.setYear(2008); -//// // aDate.setDay(7); -//// long nTime = aDate.getTime(); -//// Long aLong = new Long(nTime); -//// String aStr = aLong.toString(); -//// -//// Date aNewDate = new Date(1202382900000L); -////// aNewDate. -//// String aDateStr = aNewDate.toString(); -////// Datetime aNewTime = new Time(1202382900); -////// String aTimeStr = aNewTime.toString(); -//// -// -// } protected void clearPageFooter() { XSection xSection; @@ -1122,19 +1061,14 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter Size aSizeMM_100TH = new Size(0, 0); try { - // Object aControlContainer = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlContainer"); - // XControlContainer xControlContainer = (XControlContainer)UnoRuntime.queryInterface(XControlContainer.class, aControlContainer); final Object aFixedTextModel = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlFixedTextModel"); final XControlModel xFixedTextModel = UnoRuntime.queryInterface(XControlModel.class, aFixedTextModel); final PropertySetHelper aPropertySetHelper = new PropertySetHelper(xFixedTextModel); -// aPropertySetHelper.showProperties(); aPropertySetHelper.setPropertyValueDontThrow(PropertyNames.FONT_DESCRIPTOR, _aFont); final Object aUnoCtrlFixedText = getGlobalMSF().createInstance("com.sun.star.awt.UnoControlFixedText"); -// XServiceInfo xServiceInfo2 = (XServiceInfo)UnoRuntime.queryInterface(XServiceInfo.class, aUnoCtrlFixedText); -// String[] sServices2 = xServiceInfo2.getSupportedServiceNames(); final XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, aUnoCtrlFixedText); xWindow.setVisible(false); @@ -1155,10 +1089,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final XUnitConversion xConversion = UnoRuntime.queryInterface(XUnitConversion.class, x); aSizeMM_100TH = xConversion.convertSizeToLogic(aSizeInPixel, com.sun.star.util.MeasureUnit.MM_100TH); - // xToolkit.createScreenCompatibleDevice(_nWidth, _nWidth). - // XWindow x = getReportDefinition().getCurrentController().getFrame().getContainerWindow(); - // Object aObj = _xSection.getParent(); - // we don't need the created objects any longer final XComponent xFixedTextDeleter = UnoRuntime.queryInterface(XComponent.class, xFixedText); xFixedTextDeleter.dispose(); @@ -1251,7 +1181,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter Object aEnumObj = xEnum.nextElement(); XReportComponent aComponent = UnoRuntime.queryInterface(XReportComponent.class, aEnumObj); - // XCloneable aClone = (XCloneable)UnoRuntime.queryInterface(XCloneable.class, aEnumObj); if (aComponent != null) { Object aClone = aComponent.createClone(); @@ -1274,8 +1203,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { Logger.getLogger(ReportBuilderLayouter.class.getName()).log(Level.SEVERE, null, e); } - // String sName = xForeignSection.getName(); - // int dummy = 0; } protected void insertPageHeader() @@ -1324,10 +1251,10 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final String sTitleTitle = getResource().getResText(UIConsts.RID_REPORT + 86); // "Title:" final String sTitle = getTableName(); // "Default title, this is a first draft report generated by the new report wizard."; final String sAuthorTitle = getResource().getResText(UIConsts.RID_REPORT + 87); // "Author:" - final String sAuthor = getUserNameFromConfiguration(); // "You"; // rpt:fieldvalue(); + final String sAuthor = getUserNameFromConfiguration(); // "You"; final String sDateTitle = getResource().getResText(UIConsts.RID_REPORT + 88); // "Date:" // TODO: #i86911# Date: we need to set the style of the date. - final String sDate = "rpt:now()"; // getDateString("EEE, d MMM yyyy HH:mm:ss zzzz"); + final String sDate = "rpt:now()"; try { @@ -1346,21 +1273,18 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter aRect = insertLabel(xSection, sTitleTitle, aRect, nWidth, aSOLabel); final int nTitleWidth = getPageWidth() - getLeftPageIndent() - getRightPageIndent() - 3000; - // aRect = insertFormattedField(xSection, "rpt:Title()", aRect, nTitleWidth); aRect = insertLabel(xSection, sTitle, aRect, nTitleWidth, aSOLabel); aRect.Y += aSOLabel.getHeight(LayoutConstants.LabelHeight) + LayoutConstants.LineHeight; aRect.X = getLeftPageIndent(); aRect = insertLabel(xSection, sAuthorTitle, aRect, nWidth, aSOLabel); - // aRect = insertFormattedField(xSection, "rpt:Author()", aRect, nWidth); aRect = insertLabel(xSection, sAuthor, aRect, nTitleWidth, aSOLabel); aRect.Y += aSOLabel.getHeight(LayoutConstants.LabelHeight); aRect.X = getLeftPageIndent(); aRect = insertLabel(xSection, sDateTitle, aRect, nWidth, aSOLabel); - // aRect = insertFormattedField(xSection, "rpt:Date()", aRect, nWidth); aRect = insertFormattedField(xSection, sDate, aRect, nTitleWidth, aSOLabel); aRect.Y += aSOLabel.getHeight(LayoutConstants.FormattedFieldHeight) + LayoutConstants.LineHeight; @@ -1408,7 +1332,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } else { - // getReportDefinition().setPageFooterOn(true); getReportDefinition().setPageFooterOn(false); } } @@ -1484,7 +1407,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter protected String[] m_aFieldTitleNames; protected int[] m_aFieldWidths; protected int[] m_aFieldTypes; - // protected int[] m_nLeftIndent; private DesignTemplate m_xDesignTemplate = null; public void initializeData(IReportBuilderLayouter _aOther) @@ -1499,7 +1421,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter m_aFieldTitleNames = aOther.m_aFieldTitleNames; m_aFieldWidths = aOther.m_aFieldWidths; m_aFieldTypes = aOther.m_aFieldTypes; - // m_nLeftIndent = aOther.m_nLeftIndent; m_xDesignTemplate = aOther.m_xDesignTemplate; // dirty PageWidth @@ -1616,16 +1537,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter protected void doNotBreakInTable(Object _xSectionOrGroup) { -// try -// { -// _xSection.setKeepTogether(true); final PropertySetHelper aHelper = new PropertySetHelper(_xSectionOrGroup); aHelper.setPropertyValueDontThrow("KeepTogether", Boolean.TRUE); -// } -// catch (com.sun.star.uno.Exception e) -// { -// // Exception not set, but not really from interest. -// } } protected DesignTemplate getDesignTemplate() @@ -1635,35 +1548,6 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter // initialise the report definition. String sDefaultHeaderLayout = m_xReportDefinitionReadAccess.getDefaultHeaderLayout(); loadAndSetBackgroundTemplate(sDefaultHeaderLayout); - - // copy all functions from the design template to the current report definition -// XFunctions xOtherFunctions = m_xDesignTemplate.getReportDefinition().getFunctions(); -// final int nFunctionCount = xOtherFunctions.getCount(); -// for (int i=0;i<nFunctionCount;i++) -// { -// try -// { -// Object aOtherFunction = xOtherFunctions.getByIndex(i); -// XFunctions xFunctions = getReportDefinition().getFunctions(); -// XFunction xFunction = xFunctions.createFunction(); -// -// copyProperties(aOtherFunction, xFunction); -// xFunctions.insertByIndex(xFunctions.getCount(), xFunction); -// } -// catch (com.sun.star.lang.IllegalArgumentException e) -// { -// } -// catch (IndexOutOfBoundsException ex) -// { -// ex.printStackTrace(); -// } -// catch (WrappedTargetException ex) -// { -// ex.printStackTrace(); -// } -// -// } - } return m_xDesignTemplate; } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java index f81752d07805..27c30f85feb5 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java @@ -19,10 +19,6 @@ package com.sun.star.wizards.reportbuilder.layout; import com.sun.star.awt.FontDescriptor; -/** - * - * @author ll93751 - */ public class SectionEmptyObject extends SectionObject { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java index d6a69a4b9bf6..3797eb16a82e 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java @@ -19,11 +19,7 @@ package com.sun.star.wizards.reportbuilder.layout; import com.sun.star.awt.FontDescriptor; import com.sun.star.report.XFixedText; -// import com.sun.star.wizards.common.PropertySetHelper; -/** - * - * @author ll93751 - */ + public class SectionLabel extends SectionObject { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java index c2c1c8bbc626..de2d1cd4aded 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java @@ -21,10 +21,6 @@ import com.sun.star.awt.FontDescriptor; import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.common.PropertySetHelper; -/** - * - * @author ll93751 - */ abstract public class SectionObject { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java index f8ab197a5b37..fae7d9a2fe37 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.reportbuilder.layout; import com.sun.star.awt.FontDescriptor; import com.sun.star.report.XFormattedField; -/** - * - * @author ll93751 - */ public class SectionTextField extends SectionObject { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java index a396aa707999..fe9f4db8f6e6 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java @@ -26,10 +26,6 @@ import com.sun.star.wizards.common.Resource; import com.sun.star.wizards.report.IReportDefinitionReadAccess; import com.sun.star.wizards.ui.UIConsts; -/** - * - * @author ll93751 - */ public class Tabular extends ReportBuilderLayouter { @@ -61,7 +57,6 @@ public class Tabular extends ReportBuilderLayouter { return; } -// int nGroups = getReportDefinition().getGroups().getCount(); final XSection xSection = getReportDefinition().getDetail(); diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index f560f1ee0adb..e9d6d87f2f46 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -24,12 +24,9 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Configuration; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ -// import com.sun.star.wizards.common.ConfigGroup; public class CGCategory { diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 0ae0d5dd0fae..5d505c903e60 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -40,8 +40,6 @@ import com.sun.star.wizards.ui.UnoDialog; import com.sun.star.wizards.ui.XFieldSelectionListener; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index e04f031c5cf2..504a22f1ed17 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -36,10 +36,6 @@ import javax.swing.ListModel; import javax.swing.event.ListDataEvent; import com.sun.star.wizards.common.HelpIds; -/** - * - * @author rpiterman,ll93751 - */ public class ButtonList implements XItemEventBroadcaster, XActionListener { @@ -70,7 +66,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private IImageRenderer renderer; private ListModel listModel; public IRenderer counterRenderer = new SimpleCounterRenderer(); - private final static int LINE_HEIGHT = 8; //private MethodInvocation METHOD_MOUSE_ENTER_IMAGE; + private final static int LINE_HEIGHT = 8; /** Getter for property m_aButtonSize. * @return Value of property m_aButtonSize. @@ -93,10 +89,8 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener this.m_aButtonSize = imageSize; } -// @Override public void disposing(EventObject arg0) { - // throw new UnsupportedOperationException("Not supported yet."); } public void create(UnoDialog2 dialog) @@ -301,11 +295,9 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener else if (oResources.length == 2) { oUnoDialog.getPeerConfiguration().setImageUrl(m_aButtons[i].getModel(), oResources[0], oResources[1]); -// Helper.setUnoPropertyValue(m_aButtons[i].getModel(), PropertyNames.PROPERTY_IMAGEURL, oResources[0]); } boolean bTabStop = Boolean.TRUE; // focusable ? Boolean.TRUE : Boolean.FALSE; Helper.setUnoPropertyValue(m_aButtons[i].getModel(), "Tabstop", bTabStop); - // Object aEnabled = Helper.getUnoPropertyValue(m_aButtons[i].getModel(), PropertyNames.PROPERTY_ENABLED); if (refreshOverNull) { setVisible(m_aButtons[i], true); @@ -313,7 +305,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener focusable = false; } } -// refreshSelection(); } private void refreshCounterText() @@ -343,7 +334,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } /** - * * @param i * @return the Object in the list model corresponding to the given image index. */ @@ -361,7 +351,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } /** - * * @param i * @return the index in the listModel for the given image index. */ @@ -377,14 +366,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener public void contentsChanged(ListDataEvent event) { - /*//if the content that was changed is in the displayed range, refresh... - if ( (event.getIndex1() < getIndexFor(0)) // range is before... - || event.getIndex0() > getIndexFor( cols*rows - 1)) ; //do nothing - else - refreshImages(); - */ //m_nCurrentSelection = 0; - //pageStart = 0; - //if (event.refreshImages(); } public void intervalAdded(ListDataEvent event) @@ -404,14 +385,11 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener public void intervalRemoved(ListDataEvent event) { - //contentsChanged(event); } /** Registers ItemListener to receive events. * @param listener The listener to register. - * */ - // @Override public synchronized void addItemListener(XItemListener listener) { if (m_aItemListenerList == null) @@ -423,7 +401,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener /** Removes ItemListener from the list of listeners. * @param listener The listener to remove. - * */ public synchronized void removeItemListener(XItemListener listener) { @@ -439,8 +416,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener @SuppressWarnings("unchecked") private void fireItemSelected() { -// java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0, -// getSelectedObject(), java.awt.event.ItemEvent.SELECTED); java.util.ArrayList<XItemListener> list; synchronized(this) { @@ -456,97 +431,61 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } } - /** - * @return - */ public int getCols() { return cols; } - /** - * @return - */ public Size getGap() { return gap; } - /** - * @return - */ public ListModel getListModel() { return listModel; } - /** - * @return - */ public Short getStep() { return step; } - /** - * @return - */ public int getPageStart() { return pageStart; } - /** - * @return - */ public Size getPos() { return pos; } - /** - * @return - */ public IImageRenderer getRenderer() { return renderer; } - /** - * @return - */ public int getRows() { return rows; } - /** - * @return - */ public int getSelected() { return m_nCurrentSelection; } - /** - * @return - */ public Size getSelectionGap() { return selectionGap; } - /** - * @return - */ public boolean isShowButtons() { return showButtons; } - /** - * @param i - */ public void setCols(int i) { cols = i; @@ -633,28 +572,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener fireItemSelected(); } -/* - public void setSelected(Object object) - { - if (object == null) - { - setSelected(-1); - } - else - { - for (int i = 0; i < getListModel().getSize(); i++) - { - if (getListModel().getElementAt(i).equals(object)) - { - setSelected(i); - return; - } - } - } - setSelected(-1); - - } -*/ /** * set the text under the button list @@ -723,8 +640,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private void setBorder(Object control, Short border) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_BORDER, border); - //XWindowPeer peer = ((XControl)UnoRuntime.queryInterface(XControl.class,control)).getPeer(); - //peer.invalidate(InvalidateStyle.CHILDREN); } @@ -737,13 +652,10 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } - /** - */ public static interface IImageRenderer extends IRenderer { /** - * * @param listItem * @return two resource ids for an image referenced in the imaglist resourcefile of the * wizards project; The second one of them is designed to be used for High Contrast Mode. @@ -754,7 +666,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private static class SimpleCounterRenderer implements IRenderer { - // @Override public String render(Object counter) { return PropertyNames.EMPTY_STRING + ((Counter) counter).start + ".." + ((Counter) counter).end + "/" + ((Counter) counter).max; @@ -803,9 +714,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener setPageStart(ps); } - /** - * @return - */ public boolean isenabled() { return benabled; @@ -821,7 +729,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener { UnoDialog2.setEnabled(m_aButtons[i], b); } -// UnoDialog2.setEnabled(grbxSelectedImage, b); UnoDialog2.setEnabled(lblImageText, b); if (showButtons) { @@ -863,10 +770,8 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener * will call if a button from the m_aButtonList is pressed. * @param actionEvent */ -// @Override public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent) { - // bStopProcess = true; XControlModel xModel = (XControlModel)UnoDialog2.getModel(actionEvent.Source); PropertySetHelper aHelper = new PropertySetHelper(xModel); @@ -882,11 +787,9 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener final String sButton = sControlName.substring(7 + m_aControlName.length()); int nButton = Integer.parseInt(sButton); - // int image = getImageFromEvent(event); int index = getIndexFor(nButton); if (index < listModel.getSize()) { - // focus(image); setSelected(index); } diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 775e6682a964..b9affa2f625f 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -127,7 +127,6 @@ public abstract class ControlScroller } /** - * @author bc93774 * @param _ntotfieldcount The number of fields that are to be administered by the ControlScroller */ protected void initialize(int _ntotfieldcount) @@ -365,7 +364,6 @@ public abstract class ControlScroller return fieldInfo( scrollfields.get(guiRow + nscrollvalue)[column], scrollfields.get(guiRow)[column]); - //System.out.println("getting field info for : " + guiRow + "/" + column + ":" + pv.Value + "(" + pv.Name + ")" ); } else { diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index bec278e373ca..ce2d5383de40 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -24,8 +24,6 @@ import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.PropertyNames; /** - * @author Administrator - * * To change the template for this generated type comment go to * Window>Preferences>Java>Code Generation>Code and Comments */ @@ -45,7 +43,6 @@ public abstract class DBLimitedFieldSelection protected int iCurPosY; protected int FirstHelpIndex; protected int iCompPosX; - // protected int MaxSelIndex; public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex) { @@ -59,7 +56,6 @@ public abstract class DBLimitedFieldSelection ICompPosX = new Integer(iCompPosX); ICompPosY = new Integer(iCompPosY); ICompWidth = new Integer(iCompWidth); - // boolean bDoEnable; iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) { @@ -75,13 +71,11 @@ public abstract class DBLimitedFieldSelection protected abstract void updateFromNextControlRow(int CurIndex); - // protected abstract void setMaxSelIndex(); protected abstract int getMaxSelIndex(); protected void moveupSelectedItems(int CurIndex, boolean bDoEnable) { - // short iNextItemPos; if ((!bDoEnable) && (MAXSELINDEX > CurIndex)) { for (int i = CurIndex; i < MAXSELINDEX; i++) diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index df87b573d78d..0eebed5356b6 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -30,9 +30,6 @@ import com.sun.star.util.XCloseable; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - */ public class DocumentPreview { @@ -63,10 +60,7 @@ public class DocumentPreview public DocumentPreview(XMultiServiceFactory xmsf, Object control) throws Exception { - //((XWindow)UnoRuntime.queryInterface(XWindow.class,control)).addPaintListener(this); xControl = UnoRuntime.queryInterface(XControl.class, control); - //register this object as a listener, to close the frame when disposing. - //((XComponent) UnoRuntime.queryInterface(XComponent.class, control)).addEventListener(this); createPreviewFrame(xmsf, xControl); } @@ -96,7 +90,6 @@ public class DocumentPreview { closeFrame(); createPreviewFrame(xmsf, xControl); - //System.out.println(xControl); setDocument(url, loadArgs); } @@ -155,8 +148,6 @@ public class DocumentPreview xWindow = UnoRuntime.queryInterface(XWindow.class, xPeer); Object frame = xmsf.createInstance("com.sun.star.frame.Frame"); xFrame = UnoRuntime.queryInterface(XFrame.class, frame); -// XFrame xF = (XFrame) UnoRuntime.queryInterface(XFrame.class, Desktop.getDesktop(xmsf)); -// xFrame = xF.findFrame("_blank", 0); xFrame.initialize(xWindow); xWindow.setVisible(true); } diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 8abf43359f33..7317a900669c 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -24,10 +24,6 @@ import com.sun.star.wizards.common.JavaTools; import java.util.*; -/** - * - * @author bc93774 - */ public class FieldSelection { public XListBox xFieldsListBox; // Left ListBox @@ -68,7 +64,6 @@ public class FieldSelection public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) { - // int iPos; com.sun.star.wizards.common.Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList); switch (iKey) @@ -138,9 +133,6 @@ public class FieldSelection changeSelectionOrder(1); break; - default: - // System.err.println( exception); - break; } } catch (Exception exception) @@ -353,7 +345,7 @@ public class FieldSelection } } - // Todo: If Value is getting smaller than zero -> throw exception + // TODO: If Value is getting smaller than zero -> throw exception private Integer[] getYButtonPositions(int ButtonCount) { Integer[] YPosArray; @@ -384,7 +376,7 @@ public class FieldSelection private void changeSelectionOrder(int iNeighbor) { short[] iSelIndices = xSelectedFieldsListBox.getSelectedItemsPos(); - // Todo: we are assuming that the array starts with the lowest index. Verfy this assumption!!!!! + // TODO: we are assuming that the array starts with the lowest index. Verfy this assumption!!!!! if (iSelIndices.length == 1) { short iSelIndex = iSelIndices[0]; @@ -503,7 +495,6 @@ public class FieldSelection public void mergeList(String[] AllFieldNames, String[] SecondList) { - // int MaxIndex = SecondList.length; xFieldsListBox.addItems(AllFieldNames, (short) 0); toggleListboxButtons((short) - 1, (short) - 1); } @@ -557,10 +548,8 @@ public class FieldSelection public void selectFields(boolean bMoveAll) { - // int CurIndex; short iFieldSelected = (short) - 1; short iSelFieldSelected = (short) - 1; - // int MaxCurTarget = xSelectedFieldsListBox.getItemCount(); String[] SelFieldItems; if (bMoveAll) { @@ -600,7 +589,6 @@ public class FieldSelection public void deselectFields(boolean bMoveAll) { - // int m = 0; String SearchString; short iOldFieldSelected = xFieldsListBox.getSelectedItemPos(); short iOldSelFieldSelected = xSelectedFieldsListBox.getSelectedItemPos(); @@ -615,7 +603,6 @@ public class FieldSelection else { int MaxOriginalCount = AllFieldNames.length; - // int MaxSelected = OldSelFieldItems.length; String[] SelList = xFieldsListBox.getItems(); Vector<String> NewSourceVector = new Vector<String>(); for (int i = 0; i < MaxOriginalCount; i++) diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 40e485109591..66696603db00 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -17,8 +17,6 @@ */ package com.sun.star.wizards.ui; -// import com.sun.star.awt.*; - import com.sun.star.awt.Key; import com.sun.star.awt.KeyEvent; import com.sun.star.awt.MouseEvent; @@ -38,24 +36,13 @@ import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.ui.event.*; - - -//import com.sun.star.awt.ItemEvent; -//import com.sun.star.awt.XItemListener; - - import javax.swing.ListModel; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -/** - * - * @author rpiterman - */ public class ImageList implements XItemEventBroadcaster, ListDataListener { - // private XControl imgContainer; private XFixedText lblImageText; private XFixedText grbxSelectedImage; private XButton btnBack; @@ -88,11 +75,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener public IRenderer counterRenderer = new SimpleCounterRenderer(); private Object dialogModel; private ImageKeyListener imageKeyListener; - private static final Integer BACKGROUND_COLOR = 16777216; //new Integer(SystemColor.window.getRGB() + 16777216); + private static final Integer BACKGROUND_COLOR = 16777216; private final static Short HIDE_PAGE = new Short((short) 99); private final static Integer TRANSPARENT = new Integer(-1); - private final static int LINE_HEIGHT = 8; //private MethodInvocation METHOD_MOUSE_ENTER_IMAGE; - //private MethodInvocation METHOD_MOUSE_EXIT_IMAGE; + private final static int LINE_HEIGHT = 8; private MethodInvocation METHOD_MOUSE_PRESSED; /** Getter for property imageSize. @@ -180,12 +166,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener Boolean.TRUE }); - //XWindow win = (XWindow)UnoRuntime.queryInterface(XWindow.class,lblContainer); - /*dialog.xWindow.addWindowListener(uiEventListener); - String dName = (String)Helper.getUnoPropertyValue(dialog.xDialogModel,PropertyNames.PROPERTY_NAME); - - uiEventListener.add(dName,EventNames.EVENT_WINDOW_SHOWN,"disableContainerMouseEvents",this); - */ int selectionWidth = rowSelect ? (imageSize.Width + gap.Width) * cols - gap.Width + (selectionGap.Width * 2) : imageSize.Width + (selectionGap.Width * 2); @@ -295,8 +275,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener try { - //METHOD_MOUSE_ENTER_IMAGE = new MethodInvocation("mouseEnterImage",this,Object.class); - //METHOD_MOUSE_EXIT_IMAGE = new MethodInvocation("mouseExitImage",this,Object.class); METHOD_MOUSE_PRESSED = new MethodInvocation("mousePressed", this, Object.class); } catch (NoSuchMethodException e) @@ -360,8 +338,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener XWindow win = UnoRuntime.queryInterface(XWindow.class, image); win.addMouseListener(uiEventListener); win.addKeyListener(imageKeyListener); - //uiEventListener.add(imageName,EventNames.EVENT_MOUSE_ENTERED,METHOD_MOUSE_ENTER_IMAGE); - //uiEventListener.add(imageName,EventNames.EVENT_MOUSE_EXITED,METHOD_MOUSE_EXIT_IMAGE); uiEventListener.add(imageName, EventNames.EVENT_MOUSE_PRESSED, METHOD_MOUSE_PRESSED); return image; @@ -461,7 +437,6 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener private void moveSelection(int image) { - //System.out.println(image); setVisible(grbxSelectedImage, false); int row = image / cols; @@ -585,13 +560,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener } /** Notifies all registered listeners about the event. - * */ @SuppressWarnings("unchecked") private void fireItemSelected() { -// java.awt.event.ItemEvent event = new java.awt.event.ItemEvent(this, 0, -// getSelectedObject(), java.awt.event.ItemEvent.SELECTED); java.util.ArrayList<XItemListener> list; synchronized(this) { @@ -615,121 +587,76 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener return cols; } - /** - * @return - */ public Size getGap() { return gap; } - /** - * @return - */ public ListModel getListModel() { return listModel; } - /** - * @return - */ public Short getStep() { return step; } - /** - * @return - */ public int getPageStart() { return pageStart; } - /** - * @return - */ public Size getPos() { return pos; } - /** - * @return - */ public IImageRenderer getRenderer() { return renderer; } - /** - * @return - */ public int getRows() { return rows; } - /** - * @return - */ public int getSelected() { return selected; } - /** - * @return - */ public Size getSelectionGap() { return selectionGap; } - /** - * @return - */ public boolean isShowButtons() { return showButtons; } - /** - * @param i - */ public void setCols(int i) { cols = i; } - /** - * @param size - */ public void setGap(Size size) { gap = size; } - /** - * @param model - */ public void setListModel(ListModel model) { listModel = model; } - /** - * @param short1 - */ public void setStep(Short short1) { step = short1; } - /** - * @param i - */ public void setPageStart(int i) { if (i == pageStart) @@ -741,33 +668,21 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener refreshImages(); } - /** - * @param size - */ public void setPos(Size size) { pos = size; } - /** - * @param renderer - */ public void setRenderer(IImageRenderer renderer) { this.renderer = renderer; } - /** - * @param i - */ public void setRows(int i) { rows = i; } - /** - * @param i - */ public void setSelected(int i) { if (rowSelect && (i >= 0)) @@ -811,17 +726,11 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener Helper.setUnoPropertyValue(getModel(lblImageText), PropertyNames.PROPERTY_LABEL, PropertyNames.SPACE + renderer.render(item)); } - /** - * @param size - */ public void setSelectionGap(Size size) { selectionGap = size; } - /** - * @param b - */ public void setShowButtons(boolean b) { showButtons = b; @@ -865,28 +774,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener return UnoRuntime.queryInterface(XControl.class, control).getModel(); } - /* - public void mouseEnterImage(Object event) { - System.out.println("mouse enter"); - int i = getImageFromEvent(event); - //TODO what is when the image does not display an image? - if (getIndexFor(i) != selected) - setBorder(m_aImages[i],imageBorderMO); - } - - public void mouseExitImage(Object event) { - //System.out.println("mouse exit"); - int i = getImageFromEvent(event); //TODO what is when the image does not display an image? - if (getIndexFor(i) != selected) - setBorder(m_aImages[i],imageBorder); - } - */ private void setBorder(Object control, Short border) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_BORDER, border); - //XWindowPeer peer = ((XControl)UnoRuntime.queryInterface(XControl.class,control)).getPeer(); - //peer.invalidate(InvalidateStyle.CHILDREN); } private int getImageFromEvent(Object event) @@ -916,13 +807,10 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener }; } - /** - */ public static interface IImageRenderer extends IRenderer { /** - * * @param listItem * @return two resource ids for an image referenced in the imaglist resourcefile of the * wizards project; The second one of them is designed to be used for High Contrast Mode. @@ -1094,17 +982,11 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener setPageStart(ps); } - /** - * @return - */ public boolean isenabled() { return benabled; } - /** - * @param b - */ public void setenabled(boolean b) { diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index e01942c8d18b..b7505d340f56 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -29,9 +29,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - */ public class PeerConfig implements XWindowListener { @@ -152,7 +149,6 @@ public class PeerConfig implements XWindowListener } /** - * * @param oAPIControl an API control that the interface XControl can be derived from * @param _saccessname */ @@ -180,7 +176,6 @@ public class PeerConfig implements XWindowListener } /** - * * @param oAPIControl an API control that the interface XControl can be derived from * @param _propnames * @param _propvalues diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 4d72278dbf97..9c4d77cad4bf 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -18,9 +18,6 @@ package com.sun.star.wizards.ui; -/** - * @author rpiterman - */ public interface UIConsts { diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index c2f9dba76d7c..583751de9874 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -80,11 +80,8 @@ public class UnoDialog implements EventNames xPSetDlg = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, xUnoDialog); xDlgNames = UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); - // xDlgNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, xDialogModel); xComponent = UnoRuntime.queryInterface(XComponent.class, xUnoDialog); xWindow = UnoRuntime.queryInterface(XWindow.class, xUnoDialog); - - // setPeerConfiguration(); // LLA: will be done, if really used! } catch (com.sun.star.uno.Exception exception) { @@ -150,10 +147,6 @@ public class UnoDialog implements EventNames { com.sun.star.uno.Type seqType = new com.sun.star.uno.Type(PropertyValue.getClass()); PropertyValue = new com.sun.star.uno.Any(seqType, PropertyValue); - /* PropertyValue = Helper.getArrayValue(PropertyValue); - if (PropertyValue == null) - PropertyValue = new short[]{}; - */ } xPSet.setPropertyValue(PropertyName, PropertyValue); } @@ -302,18 +295,6 @@ public class UnoDialog implements EventNames } } - /* public XButton insertButton(String sName, int iControlKey, XActionListener xActionListener, String[] sProperties, Object[] sValues) throws com.sun.star.uno.Exception{ - Object oButtonModel = insertControlModel("com.sun.star.awt.UnoControlButtonModel", sName, sProperties, sValues); - XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oButtonModel); - xPSet.setPropertyValue(PropertyNames.PROPERTY_NAME, sName); - Object objectButton = xDlgContainer.getControl( new String(sName)); - XButton xButton = ( XButton ) UnoRuntime.queryInterface( XButton.class, objectButton ); - xButton.addActionListener(xActionListener); - Integer ControlKey = new Integer(iControlKey); - if (ControlList != null) - ControlList.put(sName, ControlKey); - return xButton; - } */ public XButton insertButton(String sName, int iControlKey, XActionListener xActionListener, String[] sProperties, Object[] sValues) throws com.sun.star.uno.Exception { Object oButtonModel = insertControlModel("com.sun.star.awt.UnoControlButtonModel", sName, sProperties, sValues); @@ -538,7 +519,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * The problem with setting the visibility of controls is that changing the current step * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against * the property "visible". Therfor a control meant to be invisible is placed on a step far far away. @@ -559,7 +539,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * The problem with setting the visibility of controls is that changing the current step * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against * the property "visible". Therfor a control meant to be invisible is placed on a step far far away. @@ -592,7 +571,6 @@ public class UnoDialog implements EventNames /** * repaints the currentDialogStep - * @author bc93774 */ public void repaintDialogStep() { @@ -671,7 +649,6 @@ public class UnoDialog implements EventNames } /** deselects a Listbox. MultipleMode is not supported - * * @param _xBasisListBox */ public static void deselectListBox(XInterface _xBasisListBox) @@ -686,7 +663,7 @@ public class UnoDialog implements EventNames public void calculateDialogPosition(Rectangle FramePosSize) { - // Todo: check if it would be useful or possible to create a dialog peer, that can be used for the messageboxes to + // TODO: check if it would be useful or possible to create a dialog peer, that can be used for the messageboxes to // maintain modality when they pop up. Rectangle CurPosSize = xWindow.getPosSize(); int WindowHeight = FramePosSize.Height; @@ -716,7 +693,6 @@ public class UnoDialog implements EventNames createWindowPeer(); } xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xWindowPeer); -// xVclWindowPeer.setProperty("AutoMnemonics", new Boolean(true)); this.BisHighContrastModeActivated = Boolean.valueOf(this.isHighContrastModeActivated()); xDialog = UnoRuntime.queryInterface(XDialog.class, xUnoDialog); return xDialog.execute(); @@ -735,7 +711,6 @@ public class UnoDialog implements EventNames } /** - * * @param parent * @return 0 for cancel, 1 for ok. * @throws com.sun.star.uno.Exception @@ -747,7 +722,6 @@ public class UnoDialog implements EventNames } /** - * * @param xComponent * @return 0 for cancel, 1 for ok. * @throws com.sun.star.uno.Exception @@ -875,7 +849,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * @param oControlModel the model of a control * @return the LabelType according to UIConsts.CONTROLTYPE */ @@ -961,7 +934,6 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * @param oControlModel * @return the name of the property that contains the value of a controlmodel */ @@ -973,13 +945,11 @@ public class UnoDialog implements EventNames } /** - * @author bc93774 * @param itype The type of the control conforming to UIConst.ControlType * @return the name of the property that contains the value of a controlmodel */ public static String getDisplayProperty(int itype) { - // String propertyname = PropertyNames.EMPTY_STRING; switch (itype) { case UIConsts.CONTROLTYPE.FIXEDTEXT: diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java index 5c9bec24e09b..4b6fcd2acf49 100644 --- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java +++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java @@ -37,7 +37,6 @@ import java.util.HashMap; * <li>Write the methods which should be performed when the event occures.</li> * <li>call the "add" method, to define a component-event-action mapping.</li> * </list> - * @author rpiterman */ public class AbstractListener { diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.java b/wizards/com/sun/star/wizards/ui/event/CommonListener.java index b3e2a78a703e..d0387f7533a6 100644 --- a/wizards/com/sun/star/wizards/ui/event/CommonListener.java +++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.java @@ -20,10 +20,6 @@ package com.sun.star.wizards.ui.event; import com.sun.star.awt.*; import com.sun.star.lang.EventObject; -/** - * - * @author rpiterman - */ public class CommonListener extends AbstractListener implements XActionListener, XItemListener, XTextListener, EventNames, XWindowListener, XMouseListener, XFocusListener, XKeyListener { diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 68c2efcd9b51..41ead473b929 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -25,7 +25,6 @@ import java.util.Iterator; import com.sun.star.wizards.common.PropertyNames; /** - * @author rpiterman * DataAware objects are used to live-synchronize UI and DataModel/DataObject. * It is used as listener on UI events, to keep the DataObject up to date. * This class, as a base abstract class, sets a frame of functionality, @@ -45,8 +44,6 @@ public abstract class DataAware { * this is the data object. */ protected Object dataObject; - //protected Method setMethod; - //protected Method getMethod; /** * A Value Object knows how to get/set a value * from/to the data object. @@ -61,8 +58,6 @@ public abstract class DataAware { protected DataAware(Object dataObject_, Value value_) { dataObject = dataObject_; value = value_; - //getMethod = createGetMethod(dataPropName, dataObject); - //setMethod = createSetMethod(dataPropName, dataObject, getMethod.getReturnType()); } /** diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index d41fa915f383..fbb733f522de 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -17,10 +17,6 @@ */ package com.sun.star.wizards.ui.event; -/** - * - * @author rpiterman - */ public interface EventNames { diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java index 36a8172beffd..31d8ed5fe2a8 100644 --- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java +++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java @@ -27,10 +27,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - - * */ public class ListModelBinder implements ListDataListener { @@ -124,17 +120,9 @@ public class ListModelBinder implements ListDataListener */ public void intervalAdded(ListDataEvent lde) { - //Short[] selected = getSelectedItems(); for (short i = (short) lde.getIndex0(); i <= lde.getIndex1(); i++) { insert(i); - - /*int insertedItems = lde.getIndex1() - lde.getIndex0() + 1; - - for (int i = 0; i<selected.length; i++) - if (selected[i].intValue() >= lde.getIndex0()) - selected[i] = new Short((short)(selected[i].shortValue() + insertedItems)); - setSelectedItems(selected);*/ } } @@ -143,24 +131,7 @@ public class ListModelBinder implements ListDataListener */ public void intervalRemoved(ListDataEvent lde) { - //Short[] selected = getSelectedItems(); - remove((short) lde.getIndex0(), (short) lde.getIndex1()); - - /*int removed = 0; - for (int i = 0; i<selected.length; i++) { - short s = selected[i].shortValue(); - if (s>=lde.getIndex0() && s<==lde.getIndex1()) { - selected[i] = null; - removed++; - } - } - - Short[] newSelected = (removed > 0 ? new Short[selected.length - removed] : selected; - if (removed>0) - - if (selected[i].intValue() >= lde.getIndex0()) - */ } public static interface Renderer diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java index 30cb57467ebb..67277c8dbce3 100644 --- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java +++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java @@ -29,7 +29,6 @@ import java.lang.reflect.Method; * wrong type, or the mothod doesnot exist on the given object. * You can trick this class howmuch you want: it will all throw exceptions * on the java level. i throw no error warnings or my own excceptions... - * @author rpiterman */ public class MethodInvocation { diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java index 6d255e76f8b2..35505ad3ed14 100644 --- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java @@ -21,9 +21,6 @@ import com.sun.star.awt.XItemListener; import com.sun.star.awt.XRadioButton; import com.sun.star.uno.UnoRuntime; -/** - * @author rpiterman - */ public class RadioDataAware extends DataAware { diff --git a/wizards/com/sun/star/wizards/ui/event/Task.java b/wizards/com/sun/star/wizards/ui/event/Task.java index 9096dd138146..95aba42f1dd0 100644 --- a/wizards/com/sun/star/wizards/ui/event/Task.java +++ b/wizards/com/sun/star/wizards/ui/event/Task.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.ui.event; import java.util.ArrayList; import java.util.List; -/** - * @author rpiterman - */ public class Task { @@ -149,42 +146,27 @@ public class Task } } - /** - * @return - */ public String getSubtaskName() { return subtaskName; } - /** - * @return - */ public String getTaskName() { return taskName; } - /** - * @param string - */ public void setSubtaskName(String string) { subtaskName = string; fireSubtaskNameChanged(); } - /** - * @return - */ public int getFailed() { return failed; } - /** - * @return - */ public int getSuccessfull() { return successfull; diff --git a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java index 24d38d2a5ba3..a907df6d59e2 100644 --- a/wizards/com/sun/star/wizards/ui/event/TaskEvent.java +++ b/wizards/com/sun/star/wizards/ui/event/TaskEvent.java @@ -19,9 +19,6 @@ package com.sun.star.wizards.ui.event; import java.util.EventObject; -/** - * @author rpiterman - */ public class TaskEvent extends EventObject { diff --git a/wizards/com/sun/star/wizards/ui/event/TaskListener.java b/wizards/com/sun/star/wizards/ui/event/TaskListener.java index 0e4c8f6b51d4..ecec8bb17591 100644 --- a/wizards/com/sun/star/wizards/ui/event/TaskListener.java +++ b/wizards/com/sun/star/wizards/ui/event/TaskListener.java @@ -19,9 +19,6 @@ package com.sun.star.wizards.ui.event; import java.util.EventListener; -/** - * @author rpiterman - */ public interface TaskListener extends EventListener { diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index c98586aa313b..7c1d0e3843f8 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -24,8 +24,6 @@ import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.PropertyNames; /** - * @author rpiterman - * * This class suppoprts imple cases where a UI control can * be directly synchronized with a data property. * Such controls are: the different text controls @@ -71,7 +69,6 @@ public class UnoDataAware extends DataAware protected void setToUI(Object value) { - //System.out.println("Settings uno property : "+ Helper.getUnoPropertyValue(this.unoModel,PropertyNames.PROPERTY_NAME) + "<-" +stringof(value)); Helper.setUnoPropertyValue(unoModel, unoPropName, value); } diff --git a/wizards/com/sun/star/wizards/web/BackgroundsDialog.java b/wizards/com/sun/star/wizards/web/BackgroundsDialog.java index 9322d735fb08..cda5fb531cf5 100644 --- a/wizards/com/sun/star/wizards/web/BackgroundsDialog.java +++ b/wizards/com/sun/star/wizards/web/BackgroundsDialog.java @@ -30,9 +30,6 @@ import com.sun.star.wizards.ui.ImageList; import com.sun.star.wizards.web.data.CGImage; import com.sun.star.wizards.web.data.CGSettings; -/** - * @author rpiterman - */ public class BackgroundsDialog extends ImageListDialog { diff --git a/wizards/com/sun/star/wizards/web/ErrorHandler.java b/wizards/com/sun/star/wizards/web/ErrorHandler.java index 198b703b1610..21da7f1b2826 100644 --- a/wizards/com/sun/star/wizards/web/ErrorHandler.java +++ b/wizards/com/sun/star/wizards/web/ErrorHandler.java @@ -19,9 +19,6 @@ package com.sun.star.wizards.web; import com.sun.star.awt.VclWindowPeerAttribute; -/** - * @author rpiterman - */ public interface ErrorHandler { diff --git a/wizards/com/sun/star/wizards/web/ExtensionVerifier.java b/wizards/com/sun/star/wizards/web/ExtensionVerifier.java index 9a3f0885e1c7..0b7963261b5f 100644 --- a/wizards/com/sun/star/wizards/web/ExtensionVerifier.java +++ b/wizards/com/sun/star/wizards/web/ExtensionVerifier.java @@ -20,7 +20,6 @@ package com.sun.star.wizards.web; import com.sun.star.wizards.common.UCB; /** - * @author rpiterman * Verifies all String that do not end with * the given extension. * This is used to exclude from a copy all the diff --git a/wizards/com/sun/star/wizards/web/IconsDialog.java b/wizards/com/sun/star/wizards/web/IconsDialog.java index 7ea5f3975795..572834c870d4 100644 --- a/wizards/com/sun/star/wizards/web/IconsDialog.java +++ b/wizards/com/sun/star/wizards/web/IconsDialog.java @@ -28,7 +28,6 @@ import com.sun.star.wizards.ui.ImageList; import com.sun.star.wizards.web.data.CGIconSet; /** - * @author rpiterman * The dialog class for choosing an icon set. * This class simulates a model, though it does not functions really as one, * since it does not cast events. @@ -111,16 +110,10 @@ public class IconsDialog extends ImageListDialog implements ImageList.IImageRend this.setSelected(icon >= 0 ? objects[icon] : null); } - /** - * dummy - */ public synchronized void addListDataListener(javax.swing.event.ListDataListener listener) { } - /** - * dummy - */ public synchronized void removeListDataListener(javax.swing.event.ListDataListener listener) { } @@ -155,7 +148,6 @@ public class IconsDialog extends ImageListDialog implements ImageList.IImageRend icons[icon] + getIconsetPostfix(iset); sRetUrls[1] = sRetUrls[0]; - //System.out.println(s); return sRetUrls; } /* (non-Javadoc) diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java index 53210d01306f..90283b948319 100644 --- a/wizards/com/sun/star/wizards/web/ImageListDialog.java +++ b/wizards/com/sun/star/wizards/web/ImageListDialog.java @@ -53,8 +53,6 @@ import com.sun.star.wizards.ui.ImageList.Counter; * <br/> * the consturctor should recieve, among others, an Array of String resources - see * constructor documentation for details. - * - * @author rpiterman */ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts { @@ -87,7 +85,6 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts private int hid; /** - * * @param xmsf * @param resources_ a string array with the following strings : * dialog title, label text, ok, cancel, help, deselect, other. @@ -191,11 +188,6 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts il.tabIndex = 1; il.create(this); - /*lblContainer = insertLabel("lblContainer", - new String[] {PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH}, - new Object[] { 176,"lblContainer",6,17,new Short((short)5),214} - );*/ - lblTitle = insertLabel("lblTitle", new String[] { @@ -246,7 +238,6 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts * The counter renderer, which uses a template. * The template replaces the Strings "%START", "%END" and * "%TOTAL" with the respective values. - * @author rpiterman * */ public static class ARenderer implements IRenderer diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.java b/wizards/com/sun/star/wizards/web/LogTaskListener.java index 00228c04c091..b3784a5b11b6 100644 --- a/wizards/com/sun/star/wizards/web/LogTaskListener.java +++ b/wizards/com/sun/star/wizards/web/LogTaskListener.java @@ -26,7 +26,6 @@ import com.sun.star.wizards.ui.event.TaskListener; /** * used for debugging. - * @author rpiterman */ public class LogTaskListener implements TaskListener, ErrorHandler { diff --git a/wizards/com/sun/star/wizards/web/Process.java b/wizards/com/sun/star/wizards/web/Process.java index fa8bc53309eb..c04ba4dcfec5 100644 --- a/wizards/com/sun/star/wizards/web/Process.java +++ b/wizards/com/sun/star/wizards/web/Process.java @@ -46,7 +46,6 @@ import com.sun.star.wizards.web.data.CGSettings; import com.sun.star.wizards.web.export.Exporter; /** - * @author rpiterman * This class is used to process a CGSession object * and generate a site. </br> * it does the following: <br/> @@ -257,29 +256,6 @@ public class Process implements WebWizardConst, ProcessErrors return b; } -// /** -// * deletes the given directory -// * @param dir the directory to delete -// * @return true if should continue -// */ -// private boolean cleanup(String dir) { -// -// boolean success = true; -// -// if (dir != null && fileAccess.exists(dir,false)) { -// -// String[] files = fileAccess.listFiles(dir,true); -// -// for (int i = 0; i < files.length; i++) { -// if (fileAccess.isDirectory(files[i])) -// success = success && cleanup(files[i]); -// else -// success = success && fileAccess.delete(files[i]); -// -// } -// } -// return success && fileAccess.delete(dir); -// } /** * This method is used to copy style files to a target * Directory: css and background. @@ -389,7 +365,6 @@ public class Process implements WebWizardConst, ProcessErrors { try { - //copy.deleteDirContent(publish.url); task.advance(true); copy.copy(dir, publish.url); task.advance(true); @@ -401,7 +376,6 @@ public class Process implements WebWizardConst, ProcessErrors return error(e, publish, ERROR_PUBLISH, ErrorHandler.ERROR_NORMAL_IGNORE); } } - //GENERATING METHODS /** * Generates the TOC pages for the current session. * @param targetDir generating to this directory. diff --git a/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java b/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java index 99d0c84aa12a..02586ae33c44 100644 --- a/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java +++ b/wizards/com/sun/star/wizards/web/ProcessErrorHandler.java @@ -24,7 +24,6 @@ import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGPublish; /** - * @author rpiterman * used to interact error accuring when generating the * web-site to the user. * This class renders the different errors, diff --git a/wizards/com/sun/star/wizards/web/ProcessErrors.java b/wizards/com/sun/star/wizards/web/ProcessErrors.java index 0d4057191e6d..7be7ef578ff0 100644 --- a/wizards/com/sun/star/wizards/web/ProcessErrors.java +++ b/wizards/com/sun/star/wizards/web/ProcessErrors.java @@ -18,7 +18,6 @@ package com.sun.star.wizards.web; /** - * @author rpiterman * Error IDs for errors that can accure * in the interaction with the Process class. */ diff --git a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java index aec70c806654..c8cb917c0c07 100644 --- a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java +++ b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java @@ -23,7 +23,6 @@ import java.util.Map; import com.sun.star.wizards.common.IRenderer; /** - * @author rpiterman * recieves status calls from the status dialog which * apears when the user clicks "create". * allocates strings from the resources to @@ -43,7 +42,6 @@ public class ProcessStatusRenderer implements IRenderer, WebWizardConst strings.put(TASK_GENERATE_PREPARE, res.resTaskGeneratePrepare); strings.put(TASK_GENERATE_XSL, res.resTaskGenerateXsl); strings.put(TASK_PREPARE, res.resTaskPrepare); - //strings.put(TASK_PUBLISH , res.resTaskPublish ); strings.put(LOCAL_PUBLISHER, res.resTaskPublishLocal); strings.put(ZIP_PUBLISHER, res.resTaskPublishZip); strings.put(FTP_PUBLISHER, res.resTaskPublishFTP); diff --git a/wizards/com/sun/star/wizards/web/StatusDialog.java b/wizards/com/sun/star/wizards/web/StatusDialog.java index 0b47b5208620..8f7ba7e01bf8 100644 --- a/wizards/com/sun/star/wizards/web/StatusDialog.java +++ b/wizards/com/sun/star/wizards/web/StatusDialog.java @@ -32,7 +32,6 @@ import com.sun.star.wizards.ui.event.TaskEvent; import com.sun.star.wizards.ui.event.TaskListener; /** - * @author rpiterman * A Class which displays a Status Dialog with status bars. * This can display an X number of bars, to enable the * status display of more complex tasks. @@ -68,7 +67,6 @@ public class StatusDialog extends UnoDialog2 implements TaskListener if (res.length != 6) { throw new IllegalArgumentException("The resources argument should contain 6 Strings, see Javadoc on constructor."); //display a close button? - // if enableBreak == false and closeOnFinsih == false; } boolean b = !enableBreak && !closeOnFinish; @@ -126,9 +124,6 @@ public class StatusDialog extends UnoDialog2 implements TaskListener }); } -// xWindow.addWindowListener((XWindowListener)guiEventListener); -// guiEventListener.add("StatusDialog" ,EVENT_WINDOW_SHOWN, "performRunnable",this); - } private void initProgressBar(Task t) @@ -149,7 +144,6 @@ public class StatusDialog extends UnoDialog2 implements TaskListener public void setLabel(String s) { -// lblTaskName.setText(s); Helper.setUnoPropertyValue(UnoDialog.getModel(lblTaskName), PropertyNames.PROPERTY_LABEL, s); xReschedule.reschedule(); } @@ -185,13 +179,11 @@ public class StatusDialog extends UnoDialog2 implements TaskListener finished = true; if (closeOnFinish) { -// xDialog.endExecute(); parent.xWindow.setEnable(true); try { xWindow.setVisible(false); xComponent.dispose(); - //System.out.println("disposed"); } catch (Exception ex) { diff --git a/wizards/com/sun/star/wizards/web/StylePreview.java b/wizards/com/sun/star/wizards/web/StylePreview.java index 6d1aa62a74fd..e0b1d4e65a1f 100644 --- a/wizards/com/sun/star/wizards/web/StylePreview.java +++ b/wizards/com/sun/star/wizards/web/StylePreview.java @@ -23,7 +23,6 @@ import com.sun.star.wizards.common.PropertyNames; import com.sun.star.wizards.web.data.CGStyle; /** - * @author rpiterman * the style preview, which is a OOo Document Preview in * an Image Control. * This class copies the files needed for this diff --git a/wizards/com/sun/star/wizards/web/TOCPreview.java b/wizards/com/sun/star/wizards/web/TOCPreview.java index 7b4746e05a67..c7eca17259f2 100644 --- a/wizards/com/sun/star/wizards/web/TOCPreview.java +++ b/wizards/com/sun/star/wizards/web/TOCPreview.java @@ -33,7 +33,6 @@ import com.sun.star.wizards.web.data.CGLayout; import com.sun.star.wizards.web.data.CGSettings; /** - * @author rpiterman * This class both copies necessary files to * a temporary directory, generates a temporary TOC page, * and opens the generated html document in a web browser, @@ -96,7 +95,7 @@ public class TOCPreview Task task = new Task(PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING, 10000); Process.generate(xmsf, layout, doc, fileAccess, tempDir, task); Process.copyLayoutFiles(ucb, fileAccess, settings, layout, tempDir); - xDispatch.dispatch(openHyperlink, loadArgs); //Dispatch.dispatch(openHyperlink, loadArgs); + xDispatch.dispatch(openHyperlink, loadArgs); } private PropertyValue[] loadArgs(String url) diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.java b/wizards/com/sun/star/wizards/web/WWD_Events.java index 2f5d707f82d2..a4d4173e28f3 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Events.java +++ b/wizards/com/sun/star/wizards/web/WWD_Events.java @@ -192,7 +192,6 @@ public abstract class WWD_Events extends WWD_Startup } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -245,10 +244,6 @@ public abstract class WWD_Events extends WWD_Startup Helper.setUnoPropertyValue(getModel(btnDelSession), PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); // select... } Helper.setUnoPropertyValue(getModel(lstLoadSettings), PropertyNames.SELECTED_ITEMS, nextSelected); - - //ListModelBinder.fillComboBox(cbSaveSettings, settings.savedSessions.items(), null); - - } catch (Exception ex) { @@ -273,11 +268,6 @@ public abstract class WWD_Events extends WWD_Startup } private static String[] EMPTY_STRING_ARRAY = new String[0]; - /* public void loadSessionSelected() { - UIHelper.setEnabled(btnLoadSession,true); - UIHelper.setEnabled(btnDelSession,true); - } - */ /** * when the user clicks another document * in the listbox, this method is called, @@ -333,7 +323,7 @@ public abstract class WWD_Events extends WWD_Startup { StatusDialog sd = getStatusDialog(); sd.setLabel(resources.resValidatingDocuments); - sd.execute(this, task, resources.prodName); // new LoadDocs( sd.xControl, files, task ) + sd.execute(this, task, resources.prodName); LoadDocs oLoadDocs = new LoadDocs(this.xControl, files, task); oLoadDocs.loadDocuments(); task.removeTaskListener(sd); @@ -1190,10 +1180,6 @@ public abstract class WWD_Events extends WWD_Startup try { - //XCloseable xCloseable = (XCloseable) UnoRuntime.queryInterface(XCloseable.class, myDocument); - //if (xCloseable != null) - // xCloseable.close(false); - XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, myFrame); if (xCloseable != null) { @@ -1223,11 +1209,6 @@ public abstract class WWD_Events extends WWD_Startup public void loadDocuments() { - //LogTaskListener lts = new LogTaskListener(); - //task.addTaskListener(lts); - -// task.start(); - // where the documents are added to in the list (offset) int offset = (getSelectedDoc().length > 0 ? selectedDoc[0] + 1 : getDocsCount()); diff --git a/wizards/com/sun/star/wizards/web/WWD_General.java b/wizards/com/sun/star/wizards/web/WWD_General.java index ef5d781e62fb..e1064fd7051a 100644 --- a/wizards/com/sun/star/wizards/web/WWD_General.java +++ b/wizards/com/sun/star/wizards/web/WWD_General.java @@ -33,7 +33,6 @@ import com.sun.star.wizards.web.data.CGPublish; import com.sun.star.wizards.web.data.CGSettings; /** - * @author rpiterman * This class implements general methods, used by different sub-classes (either WWD_Sturtup, or WWD_Events) * or both. */ @@ -83,7 +82,6 @@ public abstract class WWD_General extends WebWizardDialog */ protected SystemDialog getDocAddDialog() { - //if (docAddDialog == null) { docAddDialog = SystemDialog.createOpenDialog(xMSF); for (int i = 0; i < settings.cp_Filters.getSize(); i++) { @@ -91,11 +89,6 @@ public abstract class WWD_General extends WebWizardDialog docAddDialog.addFilter( JavaTools.replaceSubString(f.cp_Name, resources.prodName, "%PRODNAME"), f.cp_Filter, i == 0); } - //docAddDialog.addFilter(resources.resSODocs, "*.oxt;*.sxw;*.sxc;*.sxd;*.sxi;*.sdw;*.sdc;*.sdd;*.sdi;*.sda;*.sdp" ,true); - //docAddDialog.addFilter(resources.resMSDocs, "*.doc;*.xls;*.ppt;*.pps",false); - //docAddDialog.addFilter(resources.resImages, "*.jpg;*.gif;*.png;*.bmp;*.tiff;*.jpeg;*.jpe",false); - //docAddDialog.addFilter(resources.resAllFiles,"*.*",false); - //} return docAddDialog; } @@ -324,7 +317,6 @@ public abstract class WWD_General extends WebWizardDialog } /** - * * @return false either if publishing input is wrong or there * are no publishing targets chosen. returns true when at least * one target is chosen, *and* all diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java index 8d99b3ce25f2..4d8909675c8d 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Startup.java +++ b/wizards/com/sun/star/wizards/web/WWD_Startup.java @@ -17,8 +17,6 @@ */ package com.sun.star.wizards.web; -//import com.sun.star.awt.ItemEvent; -//import com.sun.star.awt.XItemListener; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Comparator; @@ -96,9 +94,6 @@ import com.sun.star.wizards.web.data.CGStyle; * The controls are the View, The DataObjects are the Model, containing the * Data rad directly from the configuration, and the DataAware objects * are the controller inbetween. - * - * @author rpiterman - * */ public abstract class WWD_Startup extends WWD_General { @@ -193,17 +188,6 @@ public abstract class WWD_Startup extends WWD_General * instance used for that purpose. */ protected XFrame myFrame; - - - /* ****************************************** - * **************************************** - * General Methods - * **************************************** - * ****************************************** */ - - /* - * GENERAL Initialization methods - */ /** * He - my constructor ! * I call/do here in this order: <br/> @@ -284,7 +268,6 @@ public abstract class WWD_Startup extends WWD_General { Object node = Configuration.getConfigurationRoot(xMSF, "org.openoffice.Inet/Settings", false); int i = Configuration.getInt("ooInetProxyType", node); - //System.out.println("WWD:Startup:getOOProxies:" + i); switch (i) { case 0: //no proxies @@ -392,15 +375,6 @@ public abstract class WWD_Startup extends WWD_General { try { - - - /* myFrame.initialize(docWindow); - * */ - - //desktopFrame = Desktop.findAFrame(xMSF, myFrame, desktopFrame); - - //XWindow xContainerWindow = myFrame.getContainerWindow(); - XWindow xContainerWindow = myFrame.getComponentWindow(); XWindowPeer xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xContainerWindow); @@ -569,7 +543,6 @@ public abstract class WWD_Startup extends WWD_General { sda.updateData(); //TODO xf uncomment - //refresh.eventPerformed(ie); } } @@ -649,8 +622,6 @@ public abstract class WWD_Startup extends WWD_General sessionNameDA = UnoDataAware.attachEditControl(settings.cp_DefaultSession, "cp_Name", cbSaveSettings, null, true); //cleanup when exiting wizard. - //guiEventListener.add("WebWizardDialog",EventNames.EVENT_WINDOW_HIDDEN, "cleanup", this); - //xWindow.addWindowListener((XWindowListener)guiEventListener); } /** @@ -853,8 +824,6 @@ public abstract class WWD_Startup extends WWD_General // an index change accures { content.cp_Documents.remove(i--); - /*for (Iterator i = content.cp_Contents.childrenMap.values().iterator(); i.hasNext();) - checkContent((CGContent)i.next(),task);*/ } } } @@ -863,7 +832,6 @@ public abstract class WWD_Startup extends WWD_General * A Listener which is called whenever * a Publish checkbox/textbox state changes, and * changes the "create" button enable state accordingly. - * @author rpiterman */ private class CheckPublish implements DataAware.Listener { @@ -960,7 +928,6 @@ public abstract class WWD_Startup extends WWD_General */ public int compare(Object o1, Object o2) { - // TODO Auto-generated method stub if (o1 instanceof CGStyle && o2 instanceof CGStyle) { return ((CGStyle) o1).cp_Name.compareTo( diff --git a/wizards/com/sun/star/wizards/web/WWHID.java b/wizards/com/sun/star/wizards/web/WWHID.java index dedd03002423..9ef8ef4ed77d 100644 --- a/wizards/com/sun/star/wizards/web/WWHID.java +++ b/wizards/com/sun/star/wizards/web/WWHID.java @@ -24,8 +24,6 @@ package com.sun.star.wizards.web; /** - * @author rp143992 - * * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Generation - Code and Comments */ @@ -100,7 +98,6 @@ public interface WWHID public static final int HID7_TXT_ZIP = 34200 + 65; public static final int HID7_BTN_ZIP = 34200 + 66; public static final int HID7_CHK_PUBLISH_FTP = 34200 + 67; - //public static final int HID7_TXT_FTP = 34200 + 68 ; public static final int HID7_BTN_FTP = 34200 + 69; public static final int HID7_CHK_SAVE = 34200 + 70; public static final int HID7_TXT_SAVE = 34200 + 71;// web wizard backgrounds dialog diff --git a/wizards/com/sun/star/wizards/web/WebWizard.java b/wizards/com/sun/star/wizards/web/WebWizard.java index 17ee19596c1e..bce64f11ea50 100644 --- a/wizards/com/sun/star/wizards/web/WebWizard.java +++ b/wizards/com/sun/star/wizards/web/WebWizard.java @@ -29,9 +29,6 @@ import com.sun.star.wizards.common.Desktop; public class WebWizard extends WWD_Events { - /** - * @param xmsf - */ public WebWizard(XMultiServiceFactory xmsf) throws Exception { super(xmsf); diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.java b/wizards/com/sun/star/wizards/web/WebWizardDialog.java index a94c675e21a4..f88ccefd612b 100644 --- a/wizards/com/sun/star/wizards/web/WebWizardDialog.java +++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.java @@ -39,7 +39,6 @@ import com.sun.star.wizards.web.data.CGLayout; /** * This class is generated Automatically.... - * bla bla bla */ public abstract class WebWizardDialog extends WizardDialog implements WebWizardConst, UIConsts, WWHID { @@ -71,41 +70,6 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC XListBox lstDocTargetType; XFixedText lblLayoutTitle; XFixedText lblLayouts; - /*XFixedText Label1; - //Image Control - XControl ImageControl1; - //Image Control - XControl ImageControl3; - //Image Control - XControl ImageControl4; - //Image Control - XControl ImageControl5; - //Image Control - XControl ImageControl6; - XFixedText Label3; - //titled box - XControl FrameControl1; - //Image Control - XControl ImageControl2; - //Image Control - XControl ImageControl7; - //Image Control - XControl ImageControl8; - //Image Control - XControl ImageControl9; - //Image Control - XControl ImageControl10; - //Image Control - XControl ImageControl11; - //Image Control - XControl ImageControl12; - //Image Control - XControl ImageControl13; - //Image Control - XControl ImageControl14; - //Image Control - XControl ImageControl15; - */ XCheckBox chbDocDesc; XCheckBox chkDocFilename; XCheckBox chbDocAuthor; @@ -168,7 +132,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC FontDescriptor fontDescriptor4 = new FontDescriptor(); FontDescriptor fontDescriptor5 = new FontDescriptor(); FontDescriptor fontDescriptor6 = new FontDescriptor(); - FontDescriptor fontDescriptor7 = new FontDescriptor(); //private static String[] PROPNAMES_LBL_NOFOCUS = new String[] {PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH}; + FontDescriptor fontDescriptor7 = new FontDescriptor(); private static String[] PROPNAMES_LBL = new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH @@ -836,7 +800,6 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC { new Integer(-1), INTEGER_8, resources.reslblFTPDisabled, Boolean.TRUE, "lblFTPDisabled", 125, 136, INTEGERS[7], new Short(tabIndex++), 226 }); - //FTP_STEP = 99; } //else @@ -889,18 +852,11 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC ilLayouts.tabIndex = 31; ilLayouts.helpURL = HID3_IL_LAYOUTS_IMG1; - /*for (int i = 0; i<8; i++) - imgIconsPrev[i] = insertImage("imgIconPrev" + i, - new String[] { "BackgroundColor",PropertyNames.PROPERTY_BORDER,PropertyNames.PROPERTY_HEIGHT,PropertyNames.PROPERTY_IMAGEURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "ScaleImage", PropertyNames.PROPERTY_STEP, "Tabstop", PropertyNames.PROPERTY_WIDTH}, - new Object[] { new Integer(-1), new Short((short)0),14,"file:///c:/bludisk.gif", new Integer(97 + i * 20 + 7 ),147,Boolean.FALSE,INTEGERS[5],Boolean.FALSE,14}); - */ } /** * renders the images and titles of * the layouts - * @author rpiterman - */ private class LayoutRenderer implements ImageList.IImageRenderer { diff --git a/wizards/com/sun/star/wizards/web/data/CGDocument.java b/wizards/com/sun/star/wizards/web/data/CGDocument.java index c141bf76fb68..a6acf6608cfd 100644 --- a/wizards/com/sun/star/wizards/web/data/CGDocument.java +++ b/wizards/com/sun/star/wizards/web/data/CGDocument.java @@ -55,7 +55,6 @@ import com.sun.star.wizards.ui.event.Task; * the value read from the document. * The *cp_title* "overrides" *title*, if exists. if not, *title* is used. * The same is valid for *description* and *author*. - * @author rpiterman */ public class CGDocument extends ConfigSetItem implements XMLProvider { @@ -144,8 +143,6 @@ public class CGDocument extends ConfigSetItem implements XMLProvider task.advance(true); //1 - //System.out.println(Properties.getPropertyValue(mediaDescriptor,"UIName")); - analyzeFileType(mediaDescriptor); task.advance(true); //2 @@ -231,12 +228,9 @@ public class CGDocument extends ConfigSetItem implements XMLProvider ? PropertyNames.EMPTY_STRING : (String) Properties.getPropertyValue(mediaDescriptor, PropertyNames.PROPERTY_NAME); appType = getDocType(media); - //System.out.println(appType); - isSOOpenable = (appType.equals(TypeDetection.WRITER_DOC) || appType.equals(TypeDetection.CALC_DOC) || appType.equals(TypeDetection.IMPRESS_DOC) || appType.equals(TypeDetection.DRAW_DOC)) || appType.equals(TypeDetection.HTML_DOC); -// String[] parts = media.split("_"); // line removed because of compatibility to JDK13 String[] parts = JavaTools.ArrayoutofString(media, "_"); @@ -385,7 +379,6 @@ public class CGDocument extends ConfigSetItem implements XMLProvider private String getIcon(String appType) { - //System.out.println("Getting Icon for: " + appType); return appType + ".gif"; } diff --git a/wizards/com/sun/star/wizards/web/data/CGSettings.java b/wizards/com/sun/star/wizards/web/data/CGSettings.java index 6c72304549e4..ee464a41f8be 100644 --- a/wizards/com/sun/star/wizards/web/data/CGSettings.java +++ b/wizards/com/sun/star/wizards/web/data/CGSettings.java @@ -43,9 +43,6 @@ import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.common.PropertyNames; -/** - * @author rpiterman - */ public class CGSettings extends ConfigGroup { diff --git a/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java b/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java index a75640938c07..0b27a537432d 100644 --- a/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java +++ b/wizards/com/sun/star/wizards/web/data/ConfigSetItem.java @@ -24,10 +24,6 @@ package com.sun.star.wizards.web.data; import com.sun.star.wizards.common.*; -/** - * - * @author rpiterman - */ public class ConfigSetItem extends ConfigGroup implements Indexable { diff --git a/wizards/com/sun/star/wizards/web/data/TypeDetection.java b/wizards/com/sun/star/wizards/web/data/TypeDetection.java index 9be230d4f65d..c236bfcc0ab6 100644 --- a/wizards/com/sun/star/wizards/web/data/TypeDetection.java +++ b/wizards/com/sun/star/wizards/web/data/TypeDetection.java @@ -23,10 +23,6 @@ */ package com.sun.star.wizards.web.data; -/** - * - * @author rpiterman - */ public class TypeDetection { diff --git a/wizards/com/sun/star/wizards/web/export/AbstractExporter.java b/wizards/com/sun/star/wizards/web/export/AbstractExporter.java index bed3857d5f4a..284b44168b10 100644 --- a/wizards/com/sun/star/wizards/web/export/AbstractExporter.java +++ b/wizards/com/sun/star/wizards/web/export/AbstractExporter.java @@ -42,10 +42,6 @@ import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGExporter; import com.sun.star.wizards.web.data.TypeDetection; -/** - * - * @author rpiterman - */ public abstract class AbstractExporter implements Exporter { @@ -119,9 +115,6 @@ public abstract class AbstractExporter implements Exporter protected void closeDocument(Object doc, XMultiServiceFactory xmsf) { - /*OfficeDocument.dispose( - xmsf, - (XComponent) UnoRuntime.queryInterface(XComponent.class, doc));*/ try { XCloseable xc = UnoRuntime.queryInterface(XCloseable.class, doc); diff --git a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java index cba353639d32..ec5986086633 100644 --- a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java +++ b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java @@ -23,9 +23,6 @@ import java.util.Iterator; import com.sun.star.wizards.web.data.CGArgument; import com.sun.star.wizards.web.data.CGExporter; -/** - * @author rpiterman - */ public class ConfiguredExporter extends FilterExporter { diff --git a/wizards/com/sun/star/wizards/web/export/CopyExporter.java b/wizards/com/sun/star/wizards/web/export/CopyExporter.java index 77249e766414..50dca0195f01 100644 --- a/wizards/com/sun/star/wizards/web/export/CopyExporter.java +++ b/wizards/com/sun/star/wizards/web/export/CopyExporter.java @@ -23,9 +23,6 @@ import com.sun.star.wizards.common.FileAccess; import com.sun.star.wizards.ui.event.Task; import com.sun.star.wizards.web.data.CGDocument; -/** - * @author rpiterman - */ public class CopyExporter extends AbstractExporter { diff --git a/wizards/com/sun/star/wizards/web/export/Exporter.java b/wizards/com/sun/star/wizards/web/export/Exporter.java index b18df0d37beb..3c4d88c4a289 100644 --- a/wizards/com/sun/star/wizards/web/export/Exporter.java +++ b/wizards/com/sun/star/wizards/web/export/Exporter.java @@ -22,10 +22,6 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.ui.event.Task; import com.sun.star.wizards.web.data.*; -/** - * - * @author rpiterman - */ public interface Exporter { diff --git a/wizards/com/sun/star/wizards/web/export/FilterExporter.java b/wizards/com/sun/star/wizards/web/export/FilterExporter.java index 39b81e1f8744..4b5bf47ff44e 100644 --- a/wizards/com/sun/star/wizards/web/export/FilterExporter.java +++ b/wizards/com/sun/star/wizards/web/export/FilterExporter.java @@ -25,8 +25,6 @@ import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGExporter; /** - * @author rpiterman - * * An exporter which is configured with a filter name, and * uses the specified filter to export documents. */ diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java index fcae0a51d288..3392140e7a2e 100644 --- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java +++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java @@ -24,9 +24,6 @@ import com.sun.star.wizards.ui.event.Task; import com.sun.star.wizards.web.data.CGDocument; import com.sun.star.wizards.web.data.CGSession; -/** - * @author rpiterman - */ public class ImpressHTMLExporter extends ConfiguredExporter { @@ -52,13 +49,6 @@ public class ImpressHTMLExporter extends ConfiguredExporter props.put(PropertyNames.PROPERTY_WIDTH, getImageWidth(session)); - /* - * props.put("BackColor",...); - * props.put("TextColor",...); - * props.put("LinkColor",...); - * props.put("VLinkColor",...); - * props.put("ALinkColor",...); - */ props.put("UseButtonSet", new Integer(session.cp_Design.cp_IconSet)); diff --git a/wizards/com/sun/star/wizards/web/status/ErrorLog.java b/wizards/com/sun/star/wizards/web/status/ErrorLog.java index 15d7057bb07d..99bd8a73e091 100644 --- a/wizards/com/sun/star/wizards/web/status/ErrorLog.java +++ b/wizards/com/sun/star/wizards/web/status/ErrorLog.java @@ -21,9 +21,6 @@ package com.sun.star.wizards.web.status; import java.util.ArrayList; import java.util.List; -/** - * @author rpiterman - */ public class ErrorLog implements ErrorReporter { diff --git a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java index e5aad2988b25..14c9fc752d22 100644 --- a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java +++ b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java @@ -18,9 +18,6 @@ package com.sun.star.wizards.web.status; -/** - * @author rpiterman - */ public interface ErrorReporter { diff --git a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java index 7b2898c0fd06..ebe025016d63 100644 --- a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java +++ b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.web.status; import java.io.PrintStream; -/** - * @author rpiterman - */ public class LogTaskListener implements TaskListener { diff --git a/wizards/com/sun/star/wizards/web/status/Task.java b/wizards/com/sun/star/wizards/web/status/Task.java index 0896e6ce7646..bfe2ea6b5633 100644 --- a/wizards/com/sun/star/wizards/web/status/Task.java +++ b/wizards/com/sun/star/wizards/web/status/Task.java @@ -21,9 +21,6 @@ package com.sun.star.wizards.web.status; import java.util.ArrayList; import java.util.List; -/** - * @author rpiterman - */ public class Task { @@ -135,17 +132,11 @@ public class Task } } - /** - * @return - */ public String getSubtaskName() { return subtaskName; } - /** - * @return - */ public String getTaskName() { return taskName; @@ -160,17 +151,11 @@ public class Task fireSubtaskNameChanged(); } - /** - * @return - */ public int getFailed() { return failed; } - /** - * @return - */ public int getSuccessfull() { return successfull; diff --git a/wizards/com/sun/star/wizards/web/status/TaskEvent.java b/wizards/com/sun/star/wizards/web/status/TaskEvent.java index 79965f2ae57c..d84c9cf44846 100644 --- a/wizards/com/sun/star/wizards/web/status/TaskEvent.java +++ b/wizards/com/sun/star/wizards/web/status/TaskEvent.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.web.status; import java.util.EventObject; -/** - * @author rpiterman - */ public class TaskEvent extends EventObject { diff --git a/wizards/com/sun/star/wizards/web/status/TaskListener.java b/wizards/com/sun/star/wizards/web/status/TaskListener.java index 1fec9b3159e3..d0dfcaece8c9 100644 --- a/wizards/com/sun/star/wizards/web/status/TaskListener.java +++ b/wizards/com/sun/star/wizards/web/status/TaskListener.java @@ -20,9 +20,6 @@ package com.sun.star.wizards.web.status; import java.util.EventListener; -/** - * @author rpiterman - */ public interface TaskListener extends EventListener { |