From e8e4fc00e783d4f854de3d6b666c3c8268b12db4 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Tue, 25 Feb 2014 23:09:08 +0100 Subject: Remove visual noise from wizards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I27c730fa18b665bffe8c8d032fa51680cbbb2dd5 Reviewed-on: https://gerrit.libreoffice.org/8341 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- .../com/sun/star/wizards/common/ConfigGroup.java | 2 +- .../com/sun/star/wizards/common/Configuration.java | 2 +- .../sun/star/wizards/common/NumberFormatter.java | 78 ++++++++++----------- .../sun/star/wizards/common/NumericalHelper.java | 6 +- .../sun/star/wizards/common/PropertySetHelper.java | 2 +- .../com/sun/star/wizards/common/SystemDialog.java | 8 +-- wizards/com/sun/star/wizards/common/UCB.java | 56 +++++++-------- .../com/sun/star/wizards/db/CommandMetaData.java | 4 +- wizards/com/sun/star/wizards/db/DBMetaData.java | 2 +- .../sun/star/wizards/db/RelationController.java | 2 +- .../com/sun/star/wizards/db/TableDescriptor.java | 4 +- wizards/com/sun/star/wizards/document/Control.java | 4 +- .../com/sun/star/wizards/document/FormHandler.java | 9 --- .../sun/star/wizards/document/OfficeDocument.java | 2 +- .../star/wizards/document/TimeStampControl.java | 2 +- .../com/sun/star/wizards/form/DataEntrySetter.java | 4 +- .../sun/star/wizards/form/FormControlArranger.java | 2 +- .../sun/star/wizards/form/UIControlArranger.java | 64 ++++------------- .../com/sun/star/wizards/query/QuerySummary.java | 4 +- .../com/sun/star/wizards/report/Dataimport.java | 32 --------- .../wizards/report/IReportBuilderLayouter.java | 2 +- .../sun/star/wizards/report/IReportDocument.java | 38 +++++----- .../com/sun/star/wizards/report/ReportWizard.java | 29 -------- .../reportbuilder/layout/DesignTemplate.java | 8 +-- .../layout/ReportBuilderLayouter.java | 46 ++++++------ .../sun/star/wizards/table/FieldDescription.java | 6 +- .../sun/star/wizards/table/ScenarioSelector.java | 4 +- .../sun/star/wizards/ui/CommandFieldSelection.java | 2 +- .../com/sun/star/wizards/ui/DocumentPreview.java | 4 +- .../com/sun/star/wizards/ui/FilterComponent.java | 12 ++-- .../com/sun/star/wizards/ui/SortingComponent.java | 6 +- wizards/com/sun/star/wizards/ui/WizardDialog.java | 2 +- .../com/sun/star/wizards/ui/event/DataAware.java | 12 ++-- .../sun/star/wizards/ui/event/DataAwareFields.java | 6 +- .../star/wizards/ui/event/MethodInvocation.java | 2 +- .../sun/star/wizards/ui/event/SimpleDataAware.java | 2 +- .../sun/star/wizards/ui/event/UnoDataAware.java | 4 +- wizards/source/euro/euro.src | 2 +- wizards/source/formwizard/dbwizres.src | 81 ++++++---------------- wizards/source/importwizard/importwi.src | 2 +- 40 files changed, 204 insertions(+), 355 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.java b/wizards/com/sun/star/wizards/common/ConfigGroup.java index a5ff80cc399a..0a71af2011d7 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.java +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.java @@ -67,7 +67,7 @@ public class ConfigGroup implements ConfigNode /** * convert the primitive type value of the * given Field object to the corresponding - * Java Object value. + * Java Object value. * @param field * @return the value of the field as a Object. * @throws IllegalAccessException diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index 3983f82f505a..d35034ea7aff 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -35,7 +35,7 @@ import com.sun.star.util.XChangesBatch; * For the get methods, two parameters must be given: name and parent, where name is the * name of the property, parent is a HierarchyElement (::com::sun::star::configuration::HierarchyElement)
* The get and set methods support hieryrchical property names like "options/gridX".
- * NOTE: not yet supported, but sometime later, + * 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. */ diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index 61bfccd8bf43..137b79d04b84 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -42,15 +42,15 @@ public class NumberFormatter public int iTextFormatKey = -1; public int iTimeFormatKey = -1; public int iLogicalFormatKey = -1; - public long lDateCorrection; + public long lDateCorrection; public XNumberFormatter xNumberFormatter; public XNumberFormats xNumberFormats; public XNumberFormatTypes xNumberFormatTypes; public XPropertySet xNumberFormatSettings; private boolean bNullDateCorrectionIsDefined = false; - private Locale aLocale; - - + private Locale aLocale; + + public NumberFormatter(XMultiServiceFactory _xMSF, XNumberFormatsSupplier _xNumberFormatsSupplier, Locale _aLocale) throws Exception { aLocale = _aLocale; @@ -58,11 +58,11 @@ public class NumberFormatter xNumberFormats = _xNumberFormatsSupplier.getNumberFormats(); xNumberFormatSettings = _xNumberFormatsSupplier.getNumberFormatSettings(); xNumberFormatter = UnoRuntime.queryInterface(XNumberFormatter.class, oNumberFormatter); - xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier); + xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier); xNumberFormatTypes = UnoRuntime.queryInterface(XNumberFormatTypes.class, xNumberFormats); - + } - + public NumberFormatter(XNumberFormatsSupplier _xNumberFormatsSupplier, Locale _aLocale) throws Exception { aLocale = _aLocale; @@ -71,24 +71,24 @@ public class NumberFormatter xNumberFormatTypes = UnoRuntime.queryInterface(XNumberFormatTypes.class, xNumberFormats); } - + /** * @param _xMSF * @param _xNumberFormatsSupplier * @return * @throws Exception * @deprecated - * + * */ public static XNumberFormatter createNumberFormatter(XMultiServiceFactory _xMSF, XNumberFormatsSupplier _xNumberFormatsSupplier) throws Exception { Object oNumberFormatter = _xMSF.createInstance("com.sun.star.util.NumberFormatter"); XNumberFormatter xNumberFormatter = UnoRuntime.queryInterface(XNumberFormatter.class, oNumberFormatter); - xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier); + xNumberFormatter.attachNumberFormatsSupplier(_xNumberFormatsSupplier); return xNumberFormatter; } - - + + /** * gives a key to pass to a NumberFormat object.
* example:
@@ -101,22 +101,22 @@ public class NumberFormatter * @param numberFormatsSupplier * @param type - a constant out of i18n.NumberFormatIndex enumeration. * @return a key to use with a util.NumberFormat instance. - * + * */ - public static int getNumberFormatterKey( Object numberFormatsSupplier, short type) + public static int getNumberFormatterKey( Object numberFormatsSupplier, short type) { Object numberFormatTypes = UnoRuntime.queryInterface(XNumberFormatsSupplier.class,numberFormatsSupplier).getNumberFormats(); Locale l = new Locale(); return UnoRuntime.queryInterface(XNumberFormatTypes.class,numberFormatTypes).getFormatIndex(type, l); } - - + + public String convertNumberToString(int _nkey, double _dblValue) { return xNumberFormatter.convertNumberToString(_nkey, _dblValue); } - - + + public static String convertNumberToString(XNumberFormatter _xNumberFormatter, int _nkey, double _dblValue) { return _xNumberFormatter.convertNumberToString(_nkey, _dblValue); @@ -128,16 +128,16 @@ public class NumberFormatter return xNumberFormatter.convertStringToNumber(_nkey, _sString); } - + /** * @param dateCorrection The lDateCorrection to set. */ - public void setNullDateCorrection(long dateCorrection) + public void setNullDateCorrection(long dateCorrection) { lDateCorrection = dateCorrection; - } - - + } + + public int defineNumberFormat(String _FormatString) { try @@ -156,13 +156,13 @@ public class NumberFormatter } } - + /** - * returns a numberformat for a FormatString. + * returns a numberformat for a FormatString. * @param _FormatString * @param _aLocale * @return - */ + */ public int defineNumberFormat(String _FormatString, Locale _aLocale) { try @@ -180,8 +180,8 @@ public class NumberFormatter return -1; } } - - + + public void setNumberFormat(XInterface _xFormatObject, int _FormatKey, NumberFormatter _oNumberFormatter) { @@ -237,7 +237,7 @@ public class NumberFormatter } } - + public int setBooleanReportDisplayNumberFormat() { String FormatString = "[=1]" + '"' + (char)9745 + '"' + ";[=0]" + '"' + (char)58480 + '"' + ";0"; @@ -252,12 +252,12 @@ public class NumberFormatter catch (Exception e) { //MalformedNumberFormat e.printStackTrace(); - iLogicalFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.LOGICAL, aLocale); + iLogicalFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.LOGICAL, aLocale); } return iLogicalFormatKey; - } - - + } + + /** * @return Returns the iDateFormatKey. */ @@ -265,7 +265,7 @@ public class NumberFormatter { if (iDateFormatKey == -1) { - iDateFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.DATE, aLocale); + iDateFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.DATE, aLocale); } return iDateFormatKey; } @@ -277,7 +277,7 @@ public class NumberFormatter if (iDateTimeFormatKey == -1) { iDateTimeFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.DATETIME, aLocale); - } + } return iDateTimeFormatKey; } /** @@ -288,7 +288,7 @@ public class NumberFormatter if (iLogicalFormatKey == -1) { iLogicalFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.LOGICAL, aLocale); - } + } return iLogicalFormatKey; } /** @@ -310,7 +310,7 @@ public class NumberFormatter if (iTextFormatKey == -1) { iTextFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.TEXT, aLocale); - } + } return iTextFormatKey; } /** @@ -321,7 +321,7 @@ public class NumberFormatter if (iTimeFormatKey == -1) { iTimeFormatKey = xNumberFormatTypes.getStandardFormat(NumberFormat.TIME, aLocale); - } + } return iTimeFormatKey; - } + } } diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index c0f88796dae7..3655315cb88d 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -327,7 +327,7 @@ public class NumericalHelper /** @param _aValue a object this can contain anything @return true, if the parameter aValue is type of real numbers - + see also http://en.wikipedia.org/wiki/Mathematics */ public static boolean isRealNumber(Object _aValue) @@ -1050,7 +1050,7 @@ public class NumericalHelper // throws com.sun.star.script.BasicErrorException { // return RomanNumbering.getRomanEquivalent(n); // } - /** + /** * get the type object from the given object * @param aValue an object representing a (numerical) value; can also be an 'any' * @return a type object: the object together with the its type information @@ -1409,7 +1409,7 @@ public class NumericalHelper } String number = NumericalHelper.toString(new Integer(n)); /* converison idea: every digit is written with a maximum of two - * different roman symbols, using three in total, e.g. CC, CD, + * different roman symbols, using three in total, e.g. CC, CD, * DCC, CM for the hundreds (meaning 200, 400, 700 and 900). * So every digit is converted separately with regard to the * special cases 4 and 9. diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java index 7f59d3bd6d41..e0c5a119cb1b 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java @@ -69,7 +69,7 @@ public class PropertySetHelper } /** - set a property, + set a property, @param _sName name of the property to set @param _aValue property value as object * @throws java.lang.Exception diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index 575bd904b634..8cfc29e751d3 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -132,10 +132,10 @@ public class SystemDialog } /** - * + * * @param displayDir * @param defaultName - * given url to a local path. + * given url to a local path. * @return */ public String callStoreDialog(String displayDir, String defaultName) @@ -319,11 +319,11 @@ public class SystemDialog */ /** * @param windowServiceName one of the following strings: - * "ErrorBox", "WarningBox", "MessBox", "InfoBox", "QueryBox". + * "ErrorBox", "WarningBox", "MessBox", "InfoBox", "QueryBox". * There are other values possible, look * under src/toolkit/source/awt/vcltoolkit.cxx * @param windowAttribute see com.sun.star.awt.VclWindowPeerAttribute - * @return 0 = cancel, 1 = ok, 2 = yes, 3 = no(I'm not sure here) + * @return 0 = cancel, 1 = ok, 2 = yes, 3 = no(I'm not sure here) * other values check for yourself ;-) */ public static int showMessageBox(XMultiServiceFactory xMSF, String windowServiceName, int windowAttribute, String MessageText) diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index cef1af3afbb5..9406fe7a34cb 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -50,15 +50,15 @@ public class UCB private Object ucb; private FileAccess fa; - + public UCB(XMultiServiceFactory xmsf) throws Exception { - ucb = xmsf.createInstanceWithArguments( + ucb = xmsf.createInstanceWithArguments( "com.sun.star.ucb.UniversalContentBroker", new Object[0] ); fa = new FileAccess(xmsf); } - - public void deleteDirContent(String dir) + + public void deleteDirContent(String dir) throws Exception { if (!fa.exists(dir,true)) @@ -71,18 +71,18 @@ public class UCB delete(FileAccess.connectURLs(dir ,l.get(i))); } } - + public void delete(String filename) throws Exception { //System.out.println("UCB.delete(" + filename); executeCommand( getContent(filename),"delete",Boolean.TRUE); } - + public void copy(String sourceDir, String targetDir) throws Exception { copy(sourceDir,targetDir,(Verifier)null); } - + public void copy(String sourceDir, String targetDir, Verifier verifier) throws Exception { List files = listFiles(sourceDir,verifier); @@ -90,9 +90,9 @@ public class UCB { copy(sourceDir, files.get(i), targetDir); } - + } - + public void copy(String sourceDir, String filename, String targetDir, String targetName) throws Exception { if (!fa.exists(targetDir,true)) @@ -101,7 +101,7 @@ public class UCB } executeCommand(ucb, "globalTransfer", copyArg(sourceDir,filename, targetDir,targetName)); } - + /** * @deprecated * @param sourceDir @@ -124,7 +124,7 @@ public class UCB */ public GlobalTransferCommandArgument copyArg(String sourceDir, String sourceFilename, String targetDir, String targetFilename) { - + GlobalTransferCommandArgument aArg = new GlobalTransferCommandArgument(); aArg.Operation = TransferCommandOperation.COPY; aArg.SourceURL = fa.getURL(sourceDir,sourceFilename); @@ -134,9 +134,9 @@ public class UCB aArg.NameClash = NameClash.OVERWRITE; return aArg; } - + public Object executeCommand(Object xContent, String aCommandName, Object aArgument) - throws com.sun.star.ucb.CommandAbortedException, + throws com.sun.star.ucb.CommandAbortedException, com.sun.star.uno.Exception { XCommandProcessor xCmdProcessor = UnoRuntime.queryInterface( @@ -153,22 +153,22 @@ public class UCB Object xContent = getContent(path); OpenCommandArgument2 aArg = new OpenCommandArgument2(); - aArg.Mode = OpenMode.ALL; - aArg.Priority = 32768; + aArg.Mode = OpenMode.ALL; + aArg.Priority = 32768; // Fill info for the properties wanted. aArg.Properties = new Property[] {new Property()}; - + aArg.Properties[0].Name = PropertyNames.PROPERTY_TITLE; aArg.Properties[0].Handle = -1; - + XDynamicResultSet xSet; xSet = UnoRuntime.queryInterface( XDynamicResultSet.class,executeCommand(xContent, "open", aArg)); XResultSet xResultSet = xSet.getStaticResultSet(); - + List files = new ArrayList(); if (xResultSet.first()) @@ -194,10 +194,10 @@ public class UCB } while (xResultSet.next()); // next child } - + if (verifier != null) { - for (int i = 0; i type) throws Exception { @@ -216,7 +216,7 @@ public class UCB pv[0] = new Property(); pv[0].Name = propName; pv[0].Handle = -1; - + Object row = executeCommand(content,"getPropertyValues",pv); XRow xrow = UnoRuntime.queryInterface(XRow.class,row); if (type.equals(String.class)) @@ -239,20 +239,20 @@ public class UCB { return null; } - + } - + public Object getContent(String path) throws Exception { XContentIdentifier id = UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb).createContentIdentifier(path); - + return UnoRuntime.queryInterface( XContentProvider.class,ucb).queryContent(id); } - + public static interface Verifier { - public boolean verify(Object object); + public boolean verify(Object object); } } diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index e0ca1d67ba16..1e376ce8efb8 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -583,7 +583,7 @@ public class CommandMetaData extends DBMetaData } /**@deprecated use 'RelationController' class instead - * + * * @param _stablename * @param _ncommandtype * @return @@ -630,7 +630,7 @@ public class CommandMetaData extends DBMetaData } /**@deprecated use 'RelationController' class instead - * + * * @param _sreferencedtablename * @return */ diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 9e8b98d57548..cda9ee32e00e 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -411,7 +411,7 @@ public class DBMetaData // NumericTypes are all types where aggregate functions can be performed on. // Similarly to a major competitor date/time/timmestamp fields are not included - + } public boolean isBinaryDataType(int _itype) diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java index d8ce52e72487..b37457ef9986 100644 --- a/wizards/com/sun/star/wizards/db/RelationController.java +++ b/wizards/com/sun/star/wizards/db/RelationController.java @@ -130,7 +130,7 @@ public class RelationController extends CommandName { aSlaveFieldNamesVector.add(sForeignColumnName); aMasterFieldNamesVector.add(sPrimaryColumnName); - bleaveLoop = true; //Only one relation may exist between two tables... + bleaveLoop = true; //Only one relation may exist between two tables... } } diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index cd61ef65d98f..3801ee176b72 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -848,5 +848,5 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } return bhastoinsert; } -} - +} + diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index e8b78f1d32fb..9e550ed3a21e 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -267,7 +267,7 @@ public class Control extends Shape /** the peer should be retrieved every time before it is used because it * might be disposed otherwise - * + * * @return */ public XLayoutConstrains getPeer() @@ -295,7 +295,7 @@ public class Control extends Shape } else { - xPropertySet.setPropertyValue("EffectiveValue", new Double(dblEffMax)); //new Double(100000.2)); // + xPropertySet.setPropertyValue("EffectiveValue", new Double(dblEffMax)); //new Double(100000.2)); } aPreferredSize = getPeer().getPreferredSize(); xPropertySet.setPropertyValue("EffectiveValue", com.sun.star.uno.Any.VOID); diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 977dbe0cccfc..065c28b0150f 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -442,17 +442,8 @@ public class FormHandler for (int i = 0; i < ControlList.length; i++) { if (ControlList[i] != null) -// try { -// this.xDrawPage.remove(ControlList[i].xShape); { ControlList[i].setPosition(new Point(this.iXNirwanaPos, this.iYNirwanaPos)); -// String sControlName = (String) ControlList[i].xPropertySet.getPropertyValue(PropertyNames.PROPERTY_NAME); -// -// if (_xNamedForm.hasByName(sControlName)) -// _xNamedForm.removeByName(sControlName); -// } catch (Exception e) { -// e.printStackTrace(System.err); -// } } } } diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java index 7a85f2d244c1..06425e5df782 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.java +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java @@ -114,7 +114,7 @@ public class OfficeDocument * Create a new office document, attached to the given frame. * @param frame * @param sDocumentType e.g. swriter, scalc, ( simpress, scalc : not tested) - * @return the document Component (implements XComponent) object ( XTextDocument, or XSpreadsheedDocument ) + * @return the document Component (implements XComponent) object ( XTextDocument, or XSpreadsheedDocument ) */ public static Object createNewDocument(XFrame frame, String sDocumentType, boolean preview, boolean readonly) { diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index 84e82780bc63..2d7f45bbef5f 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -37,7 +37,7 @@ public class TimeStampControl extends DatabaseControl DatabaseControl oDateControl; DatabaseControl oTimeControl; -// XShape xGroupShape; +// XShape xGroupShape; Resource oResource; private String sDateAppendix; // = GetResText(RID_FORM + 4) private String sTimeAppendix; // = GetResText(RID_FORM + 5) diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index d2ccdc158eb5..29cb69f244f9 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -43,8 +43,8 @@ public class DataEntrySetter this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (FormWizard.SODATA_PAGE * 100); Integer IDataStep = new Integer(FormWizard.SODATA_PAGE); - String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44); // - String sDisplayAllData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 46); // + String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44); + String sDisplayAllData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 46); String sNoModification = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 47); // AllowUpdates String sNoDeletion = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 48); // AllowDeletes String sNoAddition = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 49); // AlowInserts diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index 23c6701ac6ed..48230befde13 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -243,7 +243,7 @@ public class FormControlArranger } /** - * + * * @param StartIndex * @param EndIndex * @param nDist diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 72f981c48bd3..6e48ab0d54ae 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -103,46 +103,6 @@ public class UIControlArranger HelpTexts[2] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); // "As Data Sheet" HelpTexts[3] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 39); // In Blocks - Labels Above" -// flnLabelPlacement = CurUnoDialog.insertFixedLine("lnArrangementHeader1", -// new String[] -// { -// PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH -// }, -// new Object[] -// { -// UIConsts.INTEGERS[8], sArrangementHeader[0], 97, 60, IControlStep, new Short(curtabindex++), 207 -// }); -// -// boolean bEnabled = true; -// int nBtnWidth = 16; -// int nXPos = 97; -// int nYPos = 70; -// CurUnoDialog.insertButton("btnLayout1", "btnLayout1", -// new String[] -// { -// PropertyNames.PROPERTY_ENABLED, -// PropertyNames.PROPERTY_HEIGHT, -// PropertyNames.PROPERTY_HELPURL, -// PropertyNames.PROPERTY_LABEL, -// PropertyNames.PROPERTY_POSITION_X, -// PropertyNames.PROPERTY_POSITION_Y, -// PropertyNames.PROPERTY_STEP, -// PropertyNames.PROPERTY_TABINDEX, -// PropertyNames.PROPERTY_WIDTH -// }, -// new Object[] -// { -// Boolean.valueOf(bEnabled), -// 14, -///* TODO: WRONG!*/ "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", -// "1", -// new Integer(nXPos + nBtnWidth), -// new Integer(nYPos), -// IControlStep, -// new Short(curtabindex++), -// 16 -// }); - DefaultListModel imageModel = new DefaultListModel(); for (int i = 0; i < HelpTexts.length; i++) { @@ -233,10 +193,10 @@ public class UIControlArranger // private class ArrangeImageList implements XItemListener // { -// + // private int formindex; // private ImageList m_aButtonList = null; // new ImageList(); -// + // public ArrangeImageList(int _formindex, ListModel model, String _sArrangementHeader) // { // formindex = _formindex; @@ -251,7 +211,7 @@ public class UIControlArranger // { // UIConsts.INTEGERS[8], _sArrangementHeader, 97, YPos, IControlStep, new Short(curtabindex++), 207 // }); -// + // int nypos = SOBASEIMAGEYPOSITION + 12 + _formindex * SOIMAGELISTHEIGHT; // m_aButtonList = new ImageList(); // m_aButtonList.setPos(new Size(107, nypos)); @@ -267,18 +227,18 @@ public class UIControlArranger // m_aButtonList.scaleImages = Boolean.FALSE; // m_aButtonList.tabIndex = (int) curtabindex++; // m_aButtonList.helpURL = 34453 + (formindex * 4); -// + // m_aButtonList.setListModel(model); // m_aButtonList.create(CurUnoDialog); // m_aButtonList.setSelected(FormWizard.SOGRID - 1); // m_aButtonList.addItemListener(this); // } -// + // public void setToLeftAlign() // { // Helper.setUnoPropertyValue(UnoDialog.getModel(optAlignLeft), PropertyNames.PROPERTY_STATE, new Short((short) 1)); // } -// + // /* (non-Javadoc) // * @see javax.swing.ListModel#addListDataListener(javax.swing.event.ListDataListener) // */ @@ -286,7 +246,7 @@ public class UIControlArranger // { // // TODO Auto-generated method stub // } -// + // public void itemStateChanged(ItemEvent arg0) // { // try @@ -298,7 +258,7 @@ public class UIControlArranger // { // final int nSelected0 = (m_aArrangeList[0].m_aButtonList.getSelected() + 1); // final int nSelected1 = (m_aArrangeList[1].m_aButtonList.getSelected() + 1); -// + // bEnableAlignControlGroup = ((nSelected0 == FormWizard.SOCOLUMNARLEFT) || // (nSelected1 == FormWizard.SOCOLUMNARLEFT)); // } @@ -318,7 +278,7 @@ public class UIControlArranger // e.printStackTrace(); // } // } -// + // /* (non-Javadoc) // * @see javax.swing.event.ListDataListener#contentsChanged(javax.swing.event.ListDataEvent) // */ @@ -326,7 +286,7 @@ public class UIControlArranger // { // // TODO Auto-generated method stub // } -// + // /* (non-Javadoc) // * @see javax.swing.event.ListDataListener#intervalAdded(javax.swing.event.ListDataEvent) // */ @@ -334,7 +294,7 @@ public class UIControlArranger // { // // TODO Auto-generated method stub // } -// + // /* (non-Javadoc) // * @see javax.swing.event.ListDataListener#intervalRemoved(javax.swing.event.ListDataEvent) // */ @@ -342,7 +302,7 @@ public class UIControlArranger // { // // TODO Auto-generated method stub // } -// + // /* (non-Javadoc) // * @see com.sun.star.lang.XEventListener#disposing(com.sun.star.lang.EventObject) // */ diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index e44e53685b00..4b915a80d35e 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -67,7 +67,7 @@ public class QuerySummary extends QueryMetaData }) + sReturnChar; sFilterFraction = combineFilterNameFraction(this.getFilterConditions(), RID_QUERY + 53, RID_QUERY + 54) + sReturnChar; // if (xDBMetaData.getNumericFunctions().length() > 0) - // sAggregateFraction = combinePartString(RID_QUERY + 55, AggregateFieldNames, RID_QUERY + 56, RID_QUERY + 95, new String[]{ "", ""}) + sReturnChar; + // sAggregateFraction = combinePartString(RID_QUERY + 55, AggregateFieldNames, RID_QUERY + 56, RID_QUERY + 95, new String[]{ "", ""}) + sReturnChar; if (xDBMetaData.supportsGroupBy()) { sGroupByFraction = combinePartString(RID_QUERY + 57, GroupFieldNames, RID_QUERY + 58) + sReturnChar; @@ -151,7 +151,7 @@ public class QuerySummary extends QueryMetaData } return _basestring; } - // TODO: How can you merge the following two methods to a single one in a smarter way?? + // TODO: How can you merge the following two methods to a single one in a smarter way?? public String combinePartString(int _InitResID, String[] _FieldNames, int _AlternativeResID) { diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 573ea2a04c1a..690d52f1bfd4 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -73,38 +73,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi CurReportDocument.StopProcess(); } -// public static void main(String args[]) -// { -// String ConnectStr = "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.NamingService"; -// XMultiServiceFactory xMSF = null; -// try -// { -// xMSF = com.sun.star.wizards.common.Desktop.connect(ConnectStr); -// if (xMSF != null) -// { -// System.out.println("Connected to " + ConnectStr); -// } -// PropertyValue[] curproperties = new PropertyValue[3]; -// curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MyHSQL.odb"); -//// curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MyDocAssign.odb"); //baseLocation ); "DataSourceName", "db1"); -//// curproperties[0] = Properties.createProperty("DataSourceName", "Bibliography"); -// curproperties[1] = Properties.createProperty(PropertyNames.COMMAND_TYPE, new Integer(CommandType.TABLE)); -// curproperties[2] = Properties.createProperty(PropertyNames.COMMAND, "Table2"); -// -// Dataimport CurDataimport = new Dataimport(xMSF); -// TextDocument oTextDocument = new TextDocument(xMSF, true, null); -// CurDataimport.createReport(xMSF, oTextDocument.xTextDocument, curproperties); -// -// } -// catch (Exception e) -// { -// e.printStackTrace(System.err); -// } -// catch (java.lang.Exception javaexception) -// { -// javaexception.printStackTrace(System.err); -// } -// } public void showProgressDisplay(XMultiServiceFactory xMSF, boolean bgetConnection) { try diff --git a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java index 3285f65705b6..5569289b6ced 100644 --- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java @@ -84,7 +84,7 @@ public interface IReportBuilderLayouter /** * Insert the names of the groups, the group names are names out of the field names. - * + * * If a group name is given here, it will not shown in the fields/titles, but must be in the field string list. * @param _aGroupFieldNames */ diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java index 18d1d8286984..6c05418d18c5 100644 --- a/wizards/com/sun/star/wizards/report/IReportDocument.java +++ b/wizards/com/sun/star/wizards/report/IReportDocument.java @@ -30,17 +30,17 @@ import java.util.ArrayList; */ public interface IReportDocument { - // ------------------------------------------------------------------------- + // initialisation - // ------------------------------------------------------------------------- + public void initialize( final XDatabaseDocumentUI i_documentUI, final Resource i_resource ); - // ------------------------------------------------------------------------- + // Access Helper - // ------------------------------------------------------------------------- + /** * Gives access to the DB Values * @return @@ -56,16 +56,16 @@ public interface IReportDocument public com.sun.star.awt.XWindowPeer getWizardParent(); /** - * + * * @return the Frame of the document Window or Report Builder Window */ public com.sun.star.frame.XFrame getFrame(); public XComponent getComponent(); - // ------------------------------------------------------------------------- + // First step: After entering the table name, select fields - // ------------------------------------------------------------------------- + /** * Is called after first step, set Tablename and the fields, which should occur in the Report. * @param _aType @@ -84,9 +84,9 @@ public interface IReportDocument */ public void removeTextTableAndTextSection(); - // ------------------------------------------------------------------------- + // Second step: Label field titles - // ------------------------------------------------------------------------- + /** * Set new names for the titles * @param sFieldTitles @@ -102,9 +102,9 @@ public interface IReportDocument * @param TitleName */ public void liveupdate_changeUserFieldContent(final String FieldName, final String TitleName); - // ------------------------------------------------------------------------- + // Third step: Grouping - // ------------------------------------------------------------------------- + /* Grouping Page */ // Document should not hold the grouping information! /** @@ -132,17 +132,17 @@ public interface IReportDocument * @param aGroupList */ public void setGrouping(String[] aGroupList); - // ------------------------------------------------------------------------- + // Fourth step: Sorting - // ------------------------------------------------------------------------- + /** * Set the list how to sort * @param aSort */ public void setSorting(String[][] aSort); - // ------------------------------------------------------------------------- + // Fivth step: Templates / Layout - // ------------------------------------------------------------------------- + /* Template Page */ public void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException; @@ -171,9 +171,9 @@ public interface IReportDocument public void layout_selectFirstPage(); public void layout_setupRecordSection(String TemplateName); - // ------------------------------------------------------------------------- + // finishing - // ------------------------------------------------------------------------- + // preview (update titlenames) // addTextListener /** @@ -212,9 +212,9 @@ public interface IReportDocument ); public void dispose(); - // ------------------------------------------------------------------------- + // Garbage dump - // ------------------------------------------------------------------------- + /* DataImport */ // ??? // public void addTextSectionCopies(); diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index c14a40bb840b..9e57fdc696c7 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -648,9 +648,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener bdoenable = m_reportDocument.getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()); } super.setStepEnabled(SOSORTPAGE, bdoenable); - - // int nCommandType = this.CurDBCommandFieldSelection.getSelectedCommandType(); - // super.setStepEnabled(SOSORTPAGE, (nCommandType == CommandType.TABLE)); } public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener @@ -714,30 +711,4 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener { } } - -// public void tests() -// { -// -// Calendar aCalendar = new GregorianCalendar(); -// aCalendar.setTimeInMillis(1202382900000L); -// String aCalStr = aCalendar.toString(); -// -// 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(); -// -// } } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index c626dcd9c58e..fc15f431346a 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -39,9 +39,9 @@ public class DesignTemplate private DesignTemplate() { } - // ------------------------------------------------------------------------- + // All functions from XReportDefinition, we use - // ------------------------------------------------------------------------- + XGroups getGroups() { return m_xReportDefinition.getGroups(); @@ -90,7 +90,7 @@ public class DesignTemplate XSection getPageFooter() throws com.sun.star.container.NoSuchElementException { return m_xReportDefinition.getPageFooter(); - } // ------------------------------------------------------------------------- + } private SectionObject m_aDetailLabel; private SectionObject m_aDetailTextField; private SectionObject[] m_aGroupLabel; @@ -265,7 +265,7 @@ public class DesignTemplate /** * create a new DesignTemplate by try to load a otr file from the given path. * Internally we store the loaded ReportDefinition. - * + * * @param _xMSF * @param _sPath * @return diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index 615634ec7a2e..31779a4fb2cc 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -117,7 +117,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter /** * Layout the complete report new, by all information we know until this time. - * + * * If there are some information less, it is no problem for this function, they will be leaved out. * It is possible to call this function after every change, but be careful, could take a little bit longer. */ @@ -158,7 +158,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter Logger.getLogger(ReportBuilderLayouter.class.getName()).log(Level.SEVERE, null, ex); } } - // ------------------------------------------------------------------------- + /** * Remove all Groups @@ -178,7 +178,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } } - // ------------------------------------------------------------------------- + /** * Remove all fields @@ -334,7 +334,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } return m_nPageWidth; } - // ------------------------------------------------------------------------- + /** * Stores the Group names. To insert/create a report with such group names, call layout() @@ -380,7 +380,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } } - // ------------------------------------------------------------------------- + protected int insertGroups() { @@ -464,7 +464,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return lastGroupPosition; } - // ------------------------------------------------------------------------- + /** * Give a list off all field title names to insert the field title names, call layout() * @param _aFieldTitleNames @@ -474,7 +474,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter m_aFieldTitleNames = _aFieldTitleNames; } - // ------------------------------------------------------------------------- + protected String getTitleFromFieldName(String _sField) { for (int i = 0; i < m_aFieldNames.length; i++) @@ -510,7 +510,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } return false; } - // ------------------------------------------------------------------------- + /** * Helper to get all field names without the names which are already in the group names @@ -560,7 +560,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return aNewList; } - // ------------------------------------------------------------------------- + protected int calculateFieldWidth(int _nLeftIndent, int _nFieldCount) { int nWidth = 3000; @@ -575,10 +575,10 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter { return getNamesWithoutGroupNames(m_aFieldNames, m_aFieldTitleNames); } - // ------------------------------------------------------------------------- + abstract protected void insertDetailFieldTitles(int lastGroupPostion); - // ------------------------------------------------------------------------- + /** * Give a list off all field names to insert the field names, call layout() @@ -604,7 +604,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return ((m_aGroupNames == null) ? 0 : m_aGroupNames.length); } - // ------------------------------------------------------------------------- + protected String[] getFieldNames() { return getNamesWithoutGroupNames(m_aFieldNames, null); @@ -633,7 +633,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } } - // ------------------------------------------------------------------------- + protected Rectangle insertLabel(XSection _xSection, String _sLabel, Rectangle _aRect, int _nWidth, SectionObject _aSO) { @@ -687,7 +687,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } return _aRect; } - // ------------------------------------------------------------------------- + protected String convertToFieldName(String _sElementName) { @@ -706,13 +706,13 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } return _sName; } - // ------------------------------------------------------------------------- + /** * Insert a already formatted field name into a given section - * + * * Use 'convertToFieldName(dbfield)' to convert a dbfield name in the right. - * + * * @param _xSection in which section the formatted field will store * @param _sFormattedfield as String a dbfield or an other function * @param _aRect .X, .Y are the absolute position (1/100mm) where the formatted field will set @@ -824,7 +824,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return _aRect; } - // ------------------------------------------------------------------------- + // TODO: check with Query, this code will not work with Queries public void setTableName(int _aType, String _sTableName) { @@ -833,7 +833,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter getReportDefinition().setCommandType(_aType); getReportDefinition().setCommand(_sTableName); - } // ------------------------------------------------------------------------- + } protected XMultiServiceFactory m_xMSF; protected XMultiServiceFactory getMSFofReportDefinition() @@ -844,7 +844,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } return m_xMSF; } - // ------------------------------------------------------------------------- + protected Rectangle insertVerticalLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight) { @@ -884,7 +884,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } return _aRect; } - // ------------------------------------------------------------------------- + protected void clearReportHeader() { @@ -985,7 +985,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } } - // ------------------------------------------------------------------------- + protected void clearPageHeader() { @@ -1051,7 +1051,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter /** * Returns the width and height of a given string (_sText) in 1/100mm drawn in the given font descriptor. * TODO: This function is a performance leak, we could store already calculated values in a map, to build a cache. Access should be much faster then. - * + * * @param _sText * @param _aFont * @return width of given text in 1/100mm diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java index 19bfecb8c4f8..976a2585039c 100644 --- a/wizards/com/sun/star/wizards/table/FieldDescription.java +++ b/wizards/com/sun/star/wizards/table/FieldDescription.java @@ -124,7 +124,7 @@ public class FieldDescription try { xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _xNameAccessFieldNode); -// Integer Index = (Integer) xPropertySet.getPropertyValue("Index"); +// Integer Index = (Integer) xPropertySet.getPropertyValue("Index"); if (propertyexists(PropertyNames.PROPERTY_NAME)) { aPropertyValues.add(Properties.createProperty(PropertyNames.PROPERTY_NAME, Name)); @@ -136,12 +136,12 @@ public class FieldDescription if (propertyexists("Scale")) { aPropertyValues.add(Properties.createProperty("Scale", xPropertySet.getPropertyValue("Scale"))); -// Scale = +// Scale = } if (propertyexists("Precision")) { aPropertyValues.add(Properties.createProperty("Precision", xPropertySet.getPropertyValue("Precision"))); -// Precision = (Integer) xPropertySet.getPropertyValue("Precision"); +// Precision = (Integer) xPropertySet.getPropertyValue("Precision"); } if (propertyexists("DefaultValue")) { diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 7ae2bd016768..5933a68e5fee 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -47,7 +47,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X { final static int PRIVATE = 0; final static int BUSINESS = 1; - + private XFixedText lblExplanation; private XFixedText lblCategories; private XRadioButton optBusiness; @@ -315,7 +315,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X { int selindex = JavaTools.FieldInList(NewItems, SelItems[i]); super.xSelectedFieldsListBox.removeItems((short) selindex, (short) 1); - /**TODO In this context the items should be better placed at their original position. + /**TODO In this context the items should be better placed at their original position. * but how is this position retrieved? */ super.xFieldsListBox.addItem(SelItems[i], xFieldsListBox.getItemCount()); diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 082bd36e631d..db20bff27904 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -269,7 +269,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< } /** returns the selected entry index in the commandListbox - * + * * @return * @throws com.sun.star.wizards.common.TerminateWizardException */ diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index 0eebed5356b6..e58c6ceb2152 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -53,7 +53,7 @@ public class DocumentPreview /********************************************************************* main - + - create new frame with window inside - load a component as preview into this frame */ @@ -120,7 +120,7 @@ public class DocumentPreview /********************************************************************* create a new frame with a new container window inside, which isnt part of the global frame tree. - + Attention: a) This frame wont be destroyed by the office. It must be closed by you! Do so - please call XCloseable::close(). diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index a75eb559f860..546c21530304 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -103,7 +103,7 @@ public class FilterComponent final int SO_THIRDBOOLFIELDNAME = 256 + 3; final int SO_FOURTHBOOLFIELDNAME = 256 + 4; int SO_BOOLEANLIST[] = - + { SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME @@ -522,10 +522,10 @@ public class FilterComponent iDateTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD HH:MM:SS"); } - // ------------------------------------------------------------------------- - // - // - // ------------------------------------------------------------------------- + + + + final class ControlRow { @@ -718,7 +718,7 @@ public class FilterComponent /** * @returns true if the current condition is complete, all needed fields are filled with values. - * So we can enable the next. + * So we can enable the next. */ boolean isConditionComplete() { diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index f61747bae107..e884baa62860 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -121,7 +121,7 @@ public class SortingComponent }, new Object[] { bDoEnable, 10, HIDString, sSortDescend[i], IOptButtonPosX, new Integer(iCurPosY + 24), new Short((short) 0), IStep, new Short(curtabindex++), "DESC", IOptButtonWidth - }); //, new Short((short) (19+i*4)) + }); //, new Short((short) (19+i*4)) iCurPosY = iCurPosY + 36; FirstHelpIndex += 3; } @@ -193,7 +193,7 @@ public class SortingComponent } /** - * sets the controls of a Sorting criterion to readonly or not. + * sets the controls of a Sorting criterion to readonly or not. * @param _index index of the Sorting criterion * @param _breadonly */ @@ -203,7 +203,7 @@ public class SortingComponent } /** - * + * * @param _index the first Sorting criterion in which 'ReadOnly is set to 'false' * @param _bcomplete */ diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index e7c3323befff..63f20366866b 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -426,7 +426,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL */ /** - * + * * @param _ndialogpage * @param ooldValue * @param onewValue diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index b83889703aed..0dc9b192d2cc 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -49,7 +49,7 @@ public abstract class DataAware { * from/to the data object. */ protected Value value; - + /** * creates a DataAware object for the given data object and Value object. * @param dataObject_ @@ -76,7 +76,7 @@ public abstract class DataAware { */ public void setDataObject(Object obj, boolean updateUI) { - if (obj != null && !value.isAssignable(obj.getClass())) + if (obj != null && !value.isAssignable(obj.getClass())) throw new ClassCastException("can not cast new DataObject to original Class"); dataObject = obj; @@ -106,7 +106,7 @@ public abstract class DataAware { protected Object getFromData() { return value.get(getDataObject()); } - + /** * sets the given value to the UI control * @param newValue the value to set to the ui control. @@ -208,7 +208,7 @@ public abstract class DataAware { for (Iterator i = dataAwares.iterator(); i.hasNext();) i.next().setDataObject(dataObject, updateUI); } - + /** * Value objects read and write a value from and * to an object. Typically using reflection and JavaBeans properties @@ -241,7 +241,7 @@ public abstract class DataAware { */ public boolean isAssignable(Class type); } - + /** * implementation of Value, handling JavaBeans properties through * reflection. @@ -268,7 +268,7 @@ public abstract class DataAware { getMethod = createGetMethod(propertyName, propertyOwner); setMethod = createSetMethod(propertyName, propertyOwner, getMethod.getReturnType()); } - + /** * called from the constructor, and creates a get method reflection object * for the given property and object. diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java index cb4baf2ea72d..ceeb902790ac 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java @@ -23,10 +23,10 @@ import com.sun.star.uno.Any; /** * This class is a factory for Value objects for different types of - * memebers. + * memebers. * Other than some Value implementations classes this class contains static * type conversion methods and factory methods. - * + * * @see com.sun.star.wizards.ui.event.DataAware.Value */ public class DataAwareFields @@ -38,7 +38,7 @@ public class DataAwareFields /** * returns a Value Object which sets and gets values * and converting them to other types, according to the "value" argument. - * + * * @param owner * @param fieldname * @param value diff --git a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java index 7e12b6aeb61b..19b03e86913a 100644 --- a/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java +++ b/wizards/com/sun/star/wizards/ui/event/MethodInvocation.java @@ -63,7 +63,7 @@ public class MethodInvocation } /** - * Returns the result of calling the method on the object, or null, if no result. + * Returns the result of calling the method on the object, or null, if no result. */ public Object invoke(Object param) throws IllegalAccessException, InvocationTargetException { diff --git a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java index c8c1f788c09f..96d8451de81b 100644 --- a/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java @@ -63,7 +63,7 @@ public class SimpleDataAware extends DataAware else if (value.equals(PropertyNames.EMPTY_STRING)) return Boolean.FALSE; else return Boolean.TRUE; } - + public void disableControls(Object[] controls) { disableObjects = controls; } diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index 7f8161297434..416efe9a7c37 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -27,9 +27,9 @@ import com.sun.star.wizards.common.PropertyNames; * This class suppoprts imple cases where a UI control can * be directly synchronized with a data property. * Such controls are: the different text controls - * (synchronizing the "Text" , "Value", "Date", "Time" property), + * (synchronizing the "Text" , "Value", "Date", "Time" property), * Checkbox controls, Dropdown listbox controls (synchronizing the - * SelectedItems[] property. + * SelectedItems[] property. * For those controls, static convenience methods are offered, to simplify use. */ public class UnoDataAware extends DataAware diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src index 9db7204b1eb8..92aac72d3883 100644 --- a/wizards/source/euro/euro.src +++ b/wizards/source/euro/euro.src @@ -24,7 +24,7 @@ #define MESSAGES 1400 #define CURRENCIES 1500 #define STEP_LASTPAGE 1600 -// -------------------------------------------------------------------- + String STEP_ZERO { Text [ en-US ] = "~Cancel"; diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index c68036c0d776..78f43b7a34b0 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -52,7 +52,7 @@ -// ============================================================================ + String RID_COMMON_START + 0 { @@ -165,7 +165,7 @@ String RID_COMMON_START + 21 }; -// end of common section ====================================================== +// end of common section String RID_DB_COMMON_START + 0 @@ -292,9 +292,9 @@ String RID_DB_COMMON_START + 45 -// ============================================================================ + // Form Wizard -// ============================================================================ + String RID_DB_FORM_WIZARD_START + 0 { @@ -645,7 +645,7 @@ String RID_DB_FORM_WIZARD_START + 98 }; -// ============================================================================ + String RID_DB_QUERY_WIZARD_START + 0 { @@ -766,7 +766,7 @@ String RID_DB_QUERY_WIZARD_START + 25 Text [ en-US] = "Value"; }; -// -------------------------------------- + // don't change anything to the next 10 values // they are list elements and need to be as follows String RID_DB_QUERY_WIZARD_START + 26 @@ -819,7 +819,7 @@ String RID_DB_QUERY_WIZARD_START + 35 { Text [ en-US] = "is not null"; }; -// -------------------------------------- + String RID_DB_QUERY_WIZARD_START + 36 { @@ -1089,11 +1089,6 @@ String RID_DB_QUERY_WIZARD_START + 96 Text [ en-US] = " "; }; - - - -// ============================================================================ - String RID_DB_REPORT_WIZARD_START + 0 { Text [ en-US ] = "Report Wizard"; @@ -1606,7 +1601,7 @@ String RID_DB_REPORT_WIZARD_START + 122 Text [ en-US ] = "Worldmap"; }; -// ============================================================================ + String RID_DB_TABLE_WIZARD_START + 1 { @@ -1857,14 +1852,7 @@ String RID_DB_TABLE_WIZARD_START + 51 Text [ en-US] = "The field '%FIELDNAME' already exists."; }; - - -// ============================================================================ -// ============================ ====================== -// ====================== LETTER WIZARD RESOURCES ================ -// ============================ ====================== -// ============================================================================ - +// LETTER WIZARD RESOURCES String RID_LETTERWIZARDDIALOG_START + 1 { @@ -2191,7 +2179,7 @@ String RID_LETTERWIZARDDIALOG_START + 66 Text [ en-US] = "Red Line"; }; -//====================== Letter Wizard Greeting Start +// Letter Wizard Greeting Start String RID_LETTERWIZARDSALUTATION_START + 1 { Text [ en-US] = "To Whom it May Concern"; @@ -2207,7 +2195,7 @@ String RID_LETTERWIZARDSALUTATION_START + 3 Text [ en-US] = "Hello"; }; -//====================== Letter Wizard Greeting Start +// Letter Wizard Greeting Start String RID_LETTERWIZARDGREETING_START + 1 { Text [ en-US] = "Sincerely"; @@ -2224,7 +2212,7 @@ String RID_LETTERWIZARDGREETING_START + 3 }; -//====================== Letter Wizard Roadmap Start +// Letter Wizard Roadmap Start String RID_LETTERWIZARDROADMAP_START + 1 { Text [ en-US] = "Page design"; @@ -2255,13 +2243,7 @@ String RID_LETTERWIZARDROADMAP_START + 6 Text [ en-US] = "Name and location"; }; - -// ============================================================================ -// ============================ ====================== -// ====================== FAX WIZARD RESOURCES ================ -// ============================ ====================== -// ============================================================================ - +// FAX WIZARD RESOURCES String RID_FAXWIZARDDIALOG_START + 1 { @@ -2538,7 +2520,7 @@ String RID_FAXWIZARDDIALOG_START + 55 Text [ en-US] = "Modern Fax from Private"; }; -//====================== Fax Wizard Communication Start +// Fax Wizard Communication Start String RID_FAXWIZARDCOMMUNICATION_START + 1 { Text [ en-US] = "Important Information!"; @@ -2554,7 +2536,7 @@ String RID_FAXWIZARDCOMMUNICATION_START + 3 Text [ en-US] = "News!"; }; -//====================== Fax Wizard Salutation Start +// Fax Wizard Salutation Start String RID_FAXWIZARDSALUTATION_START + 1 { Text [ en-US] = "To whom it may concern,"; @@ -2576,7 +2558,7 @@ String RID_FAXWIZARDSALUTATION_START + 4 }; -//====================== Fax Wizard Greeting Start +// Fax Wizard Greeting Start String RID_FAXWIZARDGREETING_START + 1 { Text [ en-US] = "Sincerely"; @@ -2598,7 +2580,7 @@ String RID_FAXWIZARDGREETING_START + 4 }; -//====================== Fax Wizard Roadmap Start +// Fax Wizard Roadmap Start String RID_FAXWIZARDROADMAP_START + 1 { Text [ en-US] = "Page design"; @@ -2624,16 +2606,7 @@ String RID_FAXWIZARDROADMAP_START + 5 Text [ en-US] = "Name and location"; }; - - - -// ============================================================================ -// ============================ ====================== -// ====================== WEB WIZARD RESOURCES ================ -// ============================ ====================== -// ============================================================================ - - +// WEB WIZARD RESOURCES String RID_WEBWIZARDDIALOG_START +1 { Text [ en-US ] = "Web Wizard"; @@ -3282,15 +3255,7 @@ String RID_WEBWIZARDDIALOG_START +152 Text [ en-US ] = "File not found. Would you like to specify a new file location?"; }; - - -// ============================================================================ -// ================= WEB WIZARD FTP DIALOG RESOURCES ============= -// ============================================================================ - - - - +// WEB WIZARD FTP DIALOG RESOURCES String RID_WEBWIZARDDIALOG_FTP +0 { Text [ en-US ] = "FTP Connection"; @@ -3386,13 +3351,7 @@ String RID_WEBWIZARDDIALOG_FTP +18 Text [ en-US ] = "Connecting..."; }; - -// ============================================================================ -// ============================ ====================== -// ====================== AGENDA WIZARD RESOURCES ================ -// ============================ ====================== -// ============================================================================ - +// AGENDA WIZARD RESOURCES String RID_AGENDAWIZARDDIALOG_START +1 { Text [en-US ] = "Agenda Wizard"; diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src index 20e22b1ff063..dfaccd6f5979 100644 --- a/wizards/source/importwizard/importwi.src +++ b/wizards/source/importwizard/importwi.src @@ -89,7 +89,7 @@ #define sSumMSDrawTemplates 3212 -// -------------------------------------------------------------------- + String sHelpButton { Text [ en-US ] = "~Help"; -- cgit v1.2.3