diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-08 12:44:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-13 08:49:23 +0200 |
| commit | 68cd011c907d00493bf2bfde531c1e244819596b (patch) | |
| tree | 0225318c908b00faaa701a19aaf7aa567c3582a0 | |
| parent | 70f56bc22fe952c75ec714e05e1bb5296491a36a (diff) | |
java: reduce scope, make some methods private
found by UCDetector
Change-Id: Ib1425edde146193a65c242dc159b7e3fbf0e4a2e
233 files changed, 721 insertions, 721 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 776b77404707..63dc9ce53b33 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -270,7 +270,7 @@ public class LocalOfficeWindow start(); } - void cancel() + private void cancel() throws java.lang.InterruptedException { aWatchedThread = null; diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index b33e32edc1a9..2717a35f964e 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -635,7 +635,7 @@ public class LocalOfficeConnection /** creates a unique pipe name. */ - static String getPipeName() + private static String getPipeName() { // turn user name into a URL and file system safe name (% chars will not work) String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX; diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java index 2058860ece8e..790ddd00372e 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java @@ -254,7 +254,7 @@ public class LocalOfficeWindow * The second NamedValue has the name "XEMBED" and the value is true, when the XEmbed * protocol shall be used fore embedding the native Window. */ - protected Any getWrappedWindowHandle() + private Any getWrappedWindowHandle() { NamedValue window = new NamedValue( diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index b81517355313..85daec2e1cf0 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -799,7 +799,7 @@ public class OOoBean @throws NoDocumentException if no document is loaded */ - public void storeToURL( + private void storeToURL( final String aURL, final com.sun.star.beans.PropertyValue aArguments[] ) throws @@ -1030,7 +1030,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible setAllBarsVisible}. */ - protected void applyToolVisibilities() + private void applyToolVisibilities() { bIgnoreVisibility = true; setMenuBarVisible( bMenuBarVisible ); @@ -1050,7 +1050,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); which can be obtained from a frame, to control toolbars. See also {@link #setAllBarsVisible}. */ - protected boolean setToolVisible( String aProperty, String aResourceURL, + private boolean setToolVisible( String aProperty, String aResourceURL, boolean bOldValue, boolean bNewValue ) throws @@ -1318,7 +1318,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar"); a new array is created, aArgument added and the new array returned. */ - protected com.sun.star.beans.PropertyValue[] addArgument( + private com.sun.star.beans.PropertyValue[] addArgument( com.sun.star.beans.PropertyValue aArguments[], final com.sun.star.beans.PropertyValue aArgument ) { diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java index 3dc947091397..b2e08164f44c 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java @@ -45,7 +45,7 @@ public class NativeStorageAccess { throw new java.io.IOException(); } } - public native void openStream(String name,String key, int mode); + private native void openStream(String name,String key, int mode); public native void close(String name,String key) throws java.io.IOException; public native long getFilePointer(String name,String key) throws java.io.IOException; diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java index bea6af9375d7..caeb103c23ca 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java @@ -30,7 +30,7 @@ public class StorageNativeInputStream { public StorageNativeInputStream(String key,String _file) { openStream(key,_file, NativeStorageAccess.READ); } - public native void openStream(String key,String name, int mode); + private native void openStream(String key,String name, int mode); public native int read(String key,String name) throws java.io.IOException; public native int read(String key,String name,byte[] b, int off, int len) throws java.io.IOException; public native void close(String key,String name) throws java.io.IOException; diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java index 281c9b173d6d..94b431965d71 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java @@ -37,7 +37,7 @@ public class StorageNativeOutputStream { openStream(name, (String)key, NativeStorageAccess.WRITE | NativeStorageAccess.TRUNCATE); } - public native void openStream(String name,String key, int mode); + private native void openStream(String name,String key, int mode); /** * Writes <code>len</code> bytes from the specified byte array * starting at offset <code>off</code> to this output stream. diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java index 78cdf43a9dfc..08b710b67159 100644 --- a/connectivity/qa/connectivity/tools/AbstractDatabase.java +++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java @@ -154,7 +154,7 @@ public abstract class AbstractDatabase implements DatabaseAccess } - final protected void createDBDocument(final String _docURL) throws Exception + final private void createDBDocument(final String _docURL) throws Exception { m_databaseDocumentFile = _docURL; diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 0f7b435d4198..eeee8f8a9537 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -901,13 +901,13 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. } - int impl_waitForEvent(ArrayList<String> _eventQueue, String _expectedEvent, int _maxMilliseconds) + private int impl_waitForEvent(ArrayList<String> _eventQueue, String _expectedEvent, int _maxMilliseconds) { return impl_waitForEvent(_eventQueue, _expectedEvent, _maxMilliseconds, 0); } - int impl_waitForEvent(ArrayList<String> _eventQueue, String _expectedEvent, int _maxMilliseconds, int _firstQueueElementToCheck) + private int impl_waitForEvent(ArrayList<String> _eventQueue, String _expectedEvent, int _maxMilliseconds, int _firstQueueElementToCheck) { synchronized (_eventQueue) { @@ -941,7 +941,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. } - void onDocumentEvent(DocumentEvent _Event) + private void onDocumentEvent(DocumentEvent _Event) { if ("OnTitleChanged".equals(_Event.EventName)) // OnTitleChanged events are notified too often. This is known, and accepted. diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java index 65ae91bf86f3..217493381ddc 100644 --- a/filter/qa/complex/filter/detection/typeDetection/Helper.java +++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java @@ -176,7 +176,7 @@ public class Helper { * cannot be read */ - public ArrayList<String> getCSVFileContent(String csvFileName) { + private ArrayList<String> getCSVFileContent(String csvFileName) { try { ArrayList<String> content = new ArrayList<String>(); BufferedReader br; @@ -283,7 +283,7 @@ public class Helper { * @param content content of a csv file * @return a stripped Vector */ - public ArrayList<String> removeSuperfluousContent(ArrayList<String> content){ + private ArrayList<String> removeSuperfluousContent(ArrayList<String> content){ ArrayList<String> newContent = new ArrayList<String>(); Iterator<String> cont = content.iterator(); while( cont.hasNext() ) { @@ -366,7 +366,7 @@ public class Helper { * type name. This information are extracted from "files.csv" * This is for faster access to get fileURL and fileType of fileAlias */ - public void createFilesList(){ + private void createFilesList(){ for (int i = 0; i < m_vFiles.size();i++){ ArrayList<String> toDo = m_vFiles.get(i); m_hFileURLs.put(toDo.get(0), toDo.get(1)); @@ -405,7 +405,7 @@ public class Helper { return dummy; } - public URL getClassURL(String fileName){ + private URL getClassURL(String fileName){ String PackagePath = this.getClass().getPackage().getName().replace('.','/'); return this.getClass().getResource("/" + PackagePath +"/" + fileName); } diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java index c5274625e44a..987af1367e85 100644 --- a/forms/qa/complex/forms/CheckOGroupBoxModel.java +++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java @@ -174,7 +174,7 @@ public class CheckOGroupBoxModel { } - public boolean wasListenerCalled() + private boolean wasListenerCalled() { return propertiesChanged; } diff --git a/forms/qa/integration/forms/DocumentHelper.java b/forms/qa/integration/forms/DocumentHelper.java index 1be009962751..cbbb73d7385b 100644 --- a/forms/qa/integration/forms/DocumentHelper.java +++ b/forms/qa/integration/forms/DocumentHelper.java @@ -65,7 +65,7 @@ public class DocumentHelper } /* ------------------------------------------------------------------ */ - protected static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception + private static XComponent implLoadAsComponent( XMultiServiceFactory orb, String documentOrFactoryURL, final PropertyValue[] i_args ) throws com.sun.star.uno.Exception { XComponentLoader aLoader = UnoRuntime.queryInterface( XComponentLoader.class, @@ -205,7 +205,7 @@ public class DocumentHelper The initial name of the form. May be null, in this case the default (which is an implementation detail) applies. */ - protected XIndexContainer createSubForm( XIndexContainer xParentContainer, String sInitialName ) + private XIndexContainer createSubForm( XIndexContainer xParentContainer, String sInitialName ) throws com.sun.star.uno.Exception { // create a new form @@ -296,7 +296,7 @@ public class DocumentHelper /* ------------------------------------------------------------------ */ /** classifies a document */ - public DocumentType classify( ) + private DocumentType classify( ) { XServiceInfo xSI = UnoRuntime.queryInterface( XServiceInfo.class, m_documentComponent ); diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java index 59b7fa02ec60..b2b06cad3990 100644 --- a/forms/qa/integration/forms/DocumentViewHelper.java +++ b/forms/qa/integration/forms/DocumentViewHelper.java @@ -87,7 +87,7 @@ public class DocumentViewHelper @return the dispatcher for the URL in question */ - public XDispatch getDispatcher( URL[] aURL ) throws java.lang.Exception + private XDispatch getDispatcher( URL[] aURL ) throws java.lang.Exception { XDispatch xReturn = null; @@ -169,7 +169,7 @@ public class DocumentViewHelper /* ------------------------------------------------------------------ */ /** retrieves the form controller for a given logical form */ - public XFormController getFormController( XForm _form ) + private XFormController getFormController( XForm _form ) { XFormLayerAccess formLayerAccess = query( XFormLayerAccess.class ); return formLayerAccess.getFormController( _form ); diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java index e1e9bd809418..e9614bb5c0e7 100644 --- a/forms/qa/org/openoffice/xforms/Instance.java +++ b/forms/qa/org/openoffice/xforms/Instance.java @@ -73,7 +73,7 @@ public class Instance * @return * the node of the newly created element */ - public XNode createElement( XNode _parentElement, String _elementName, String _initialNodeValue ) throws DOMException + private XNode createElement( XNode _parentElement, String _elementName, String _initialNodeValue ) throws DOMException { XNode node = _parentElement.appendChild( m_model.getUIHelper().createElement( _parentElement, _elementName ) @@ -100,7 +100,7 @@ public class Instance * @param _elementName * the name of the to-be-removed child */ - public XNode removeNode( XNode _parentElement, String _elementName ) throws DOMException + private XNode removeNode( XNode _parentElement, String _elementName ) throws DOMException { XNodeList nodes = _parentElement.getChildNodes(); for ( int i=0; i<nodes.getLength(); ++i ) diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 868dd63a3d45..9f6494394037 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -97,7 +97,7 @@ public class AutoSave m_aLog.log(Protocol.TYPE_SCOPE_CLOSE, ""); } - public void disableListener() + private void disableListener() { m_aLog.log(Protocol.TYPE_SCOPE_OPEN, "stop listening for AutoSave notifications ..."); diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 63f1e79fb755..528a4a2a475d 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -272,7 +272,7 @@ public class Protocol extends JComponent * format this line as a string for writing log files * using the html format */ - public synchronized String toHTML() + private synchronized String toHTML() { StringBuffer sLine = new StringBuffer(1000); sLine.append("<tr>"); @@ -716,7 +716,7 @@ public class Protocol extends JComponent resetStatistics(); } - public synchronized void resetStatistics() + private synchronized void resetStatistics() { m_nTestMarks = 0; m_nWarnings = 0; diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java index a02b756613c5..feb10f4b255a 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTools.java +++ b/framework/qa/complex/framework/recovery/RecoveryTools.java @@ -116,7 +116,7 @@ public class RecoveryTools { /** * halt the thread for some time */ - public void pause(int sleepTime){ + private void pause(int sleepTime){ sleep(sleepTime); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java index 5482b180cd88..a67fe77e12c0 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java @@ -86,7 +86,7 @@ public class DEPSAgent implements ILibEngine { pbest_t = pbest; } - protected AbsGTBehavior getGTBehavior() { + private AbsGTBehavior getGTBehavior() { if (Math.random()<switchP) { return deGTBehavior; } else { diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java index b215c348e3f4..3e7b32e855fc 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java @@ -77,7 +77,7 @@ public class DEGTBehavior extends AbsGTBehavior implements ILibEngine { Library.replace(qualityComparator, trailPoint, pbest_t); } - protected SearchPoint[] getReferPoints() { + private SearchPoint[] getReferPoints() { SearchPoint[] referPoints = new SearchPoint[DVNum*2]; for(int i=0; i<referPoints.length; i++) { referPoints[i] = socialLib.getSelectedPoint(RandomGenerator.intRangeRandom(0, socialLib.getPopSize()-1)); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java index 3b233d751568..b00ece9652ee 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java @@ -53,13 +53,13 @@ public class GlobalString { return getMeaningfulLine(outReader, NEGLECT_TAG); } - public static int getCharLoc(char data, String str) { + private static int getCharLoc(char data, String str) { for(int i=0; i<str.length(); i++) { if(str.charAt(i)==data) return i; } return -1; } - public static String trim(String origStr, String discardStr) { + private static String trim(String origStr, String discardStr) { String str = origStr; do { if(str.length()==0) return str; @@ -69,7 +69,7 @@ public class GlobalString { } while(true); } - public static boolean getFirstCharExist(String str, String chars) throws Exception { + private static boolean getFirstCharExist(String str, String chars) throws Exception { int neglectFirstCharLength = chars.length(); for(int i=0; i<neglectFirstCharLength; i++) { if(str.startsWith(chars.substring(i, i+1))) { @@ -79,7 +79,7 @@ public class GlobalString { return false; } - public static String getMeaningfulLine(BufferedReader outReader, String neglectFirstChars) throws Exception { + private static String getMeaningfulLine(BufferedReader outReader, String neglectFirstChars) throws Exception { String str; boolean isNeglect = true; do { @@ -95,7 +95,7 @@ public class GlobalString { return str; } - public static String[] getMeaningfulLines(String srcStr, String neglectFirstChars) throws Exception { + private static String[] getMeaningfulLines(String srcStr, String neglectFirstChars) throws Exception { StringReader outStringReader = new StringReader(srcStr); BufferedReader outReader = new BufferedReader(outStringReader); ArrayList<String> origData = new ArrayList<String>(); @@ -112,7 +112,7 @@ public class GlobalString { /** * convert vector to 1D String array */ - public static String[] convert1DVectorToStringArray(ArrayList<String> toToConvert) { + private static String[] convert1DVectorToStringArray(ArrayList<String> toToConvert) { if (toToConvert==null) return null; String[] objs = new String[toToConvert.size()]; for (int i=0; i<toToConvert.size(); i++) { @@ -121,7 +121,7 @@ public class GlobalString { return(objs); } - public static String getObjString(Object nObj) { + private static String getObjString(Object nObj) { if(nObj instanceof String) return (String)nObj; return nObj.toString(); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java index 47d03c1256bf..5a3f44612592 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java @@ -89,7 +89,7 @@ public static double doubleRangeRandom(double lowLimit,double upLimit){ return realV; } - public static int[] randomSelection(int[] totalIndices, int times) { + private static int[] randomSelection(int[] totalIndices, int times) { if (times>=totalIndices.length) { return totalIndices; } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java index 1efd3c7ac8af..fc4ee535fbc2 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java @@ -56,7 +56,7 @@ public class ACRComparator implements IGoodnessCompareEngine, IUpdateCycleEngine epsilon_t = lib.getExtremalVcon(true); } - static public int compare(double data1, double data2) { + static private int compare(double data1, double data2) { if (data1 < data2) return LESS_THAN; else if (data1 > data2) diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java index 695fb6fe8894..0337b2415e7f 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java @@ -30,7 +30,7 @@ public class BCHComparator implements IGoodnessCompareEngine { /* check the magnitude of two array, the frontial is more important **/ - public static int compareArray(double[] fit1, double[] fit2) { + private static int compareArray(double[] fit1, double[] fit2) { for (int i=0; i<fit1.length; i++) { if (fit1[i]>fit2[i]) { return LARGER_THAN; //Large than diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java index 80be5148c8f2..2bebff6f7fda 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java @@ -81,7 +81,7 @@ public class SCAgent { return trailPoint; } - protected void generatePoint(ILocationEngine tempPoint) { + private void generatePoint(ILocationEngine tempPoint) { SearchPoint Xmodel, Xrefer, libBPoint; // choose Selects a better point (libBPoint) from externalLib (L) based @@ -115,7 +115,7 @@ public class SCAgent { } // 1---model point, 2---refer point - public boolean inferPoint(ILocationEngine newPoint, ILocationEngine point1,ILocationEngine point2, DesignSpace space){ + private boolean inferPoint(ILocationEngine newPoint, ILocationEngine point1,ILocationEngine point2, DesignSpace space){ double[] newLoc = newPoint.getLocation(); double[] real1 = point1.getLocation(); double[] real2 = point2.getLocation(); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java index 35e2ac0c7775..bd620fa5bb9c 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java @@ -54,7 +54,7 @@ public class DesignSpace { return dimProps[dim].paramBound.boundAdjust(val); } - public void annulusAdjust (double[] location){ + private void annulusAdjust (double[] location){ for (int i=0; i<getDimension(); i++) { location[i] = dimProps[i].paramBound.annulusAdjust(location[i]); } diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java index e3db5d16fa2f..9d779afe7225 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java @@ -168,7 +168,7 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver { protected IEvolutionarySolverStatusDialog m_solverStatusDialog; - protected void prepareVariables(double[][] variableBounds) { + private void prepareVariables(double[][] variableBounds) { m_variables.clear(); for (int i = 0; i < m_variableCount; i++) { Variable var = new Variable(m_variableMap[i], i); @@ -342,7 +342,7 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver { super.finalizeSolve(); } - protected boolean checkConstraints() { + private boolean checkConstraints() { boolean result = true; for (int i = 0; i < m_constraintCount && result; i++) { if (m_extConstraints[i].Left.getError() == 0) { diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java index ef7ae96debef..7401af7eda0c 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java @@ -175,7 +175,7 @@ public abstract class BaseNLPSolver extends WeakBase Row = row; } - public CellRangeAddress getCellRangeAddress(int lastRow) { + private CellRangeAddress getCellRangeAddress(int lastRow) { CellRangeAddress result = new CellRangeAddress(); result.Sheet = Sheet; result.StartColumn = StartCol; @@ -341,11 +341,11 @@ public abstract class BaseNLPSolver extends WeakBase return m_currentParameters; } - protected XCell getCell(CellAddress cellAddress) { + private XCell getCell(CellAddress cellAddress) { return getCell(cellAddress.Column, cellAddress.Row, cellAddress.Sheet); } - protected XCell getCell(int col, int row, int sheet) { + private XCell getCell(int col, int row, int sheet) { try { XSpreadsheets xSpreadsheets = m_document.getSheets(); XIndexAccess xSheetIndex = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); @@ -365,7 +365,7 @@ public abstract class BaseNLPSolver extends WeakBase cellRangeAddress.StartRow, cellRangeAddress.EndColumn, cellRangeAddress.EndRow); } - protected XCellRangeData getCellRangeData(int sheet, int startCol, int startRow, int endCol, int endRow) { + private XCellRangeData getCellRangeData(int sheet, int startCol, int startRow, int endCol, int endRow) { try { XSpreadsheets xSpreadsheets = m_document.getSheets(); XIndexAccess xSheetIndex = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); @@ -380,12 +380,12 @@ public abstract class BaseNLPSolver extends WeakBase return null; } - protected XChartDataArray getChartDataArray(CellRangeAddress cellRangeAddress) { + private XChartDataArray getChartDataArray(CellRangeAddress cellRangeAddress) { return getChartDataArray(cellRangeAddress.Sheet, cellRangeAddress.StartColumn, cellRangeAddress.StartRow, cellRangeAddress.EndColumn, cellRangeAddress.EndRow); } - protected XChartDataArray getChartDataArray(int sheet, int startCol, int startRow, int endCol, int endRow) { + private XChartDataArray getChartDataArray(int sheet, int startCol, int startRow, int endCol, int endRow) { try { XSpreadsheets xSpreadsheets = m_document.getSheets(); XIndexAccess xSheetIndex = UnoRuntime.queryInterface(XIndexAccess.class, xSpreadsheets); @@ -487,7 +487,7 @@ public abstract class BaseNLPSolver extends WeakBase } // <editor-fold defaultstate="collapsed" desc="Helper functions"> - protected void lockDocument(boolean lock) { + private void lockDocument(boolean lock) { if (lock) m_xModel.lockControllers(); else diff --git a/odk/examples/DevelopersGuide/Charts/Helper.java b/odk/examples/DevelopersGuide/Charts/Helper.java index 725cccfb220e..0bad5c5e7588 100644 --- a/odk/examples/DevelopersGuide/Charts/Helper.java +++ b/odk/examples/DevelopersGuide/Charts/Helper.java @@ -102,7 +102,7 @@ public class Helper - public XModel createDocument( String sDocType ) + private XModel createDocument( String sDocType ) { XModel aResult = null; try diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java index c320cc3455b4..65c6b5301302 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java @@ -218,7 +218,7 @@ public class DialogComponent { * static component initialisation functions as well as in * getSupportedServiceNames. */ - public static String[] getServiceNames() { + private static String[] getServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } @@ -239,7 +239,7 @@ public class DialogComponent { return _DialogComponent.class.getName(); } - public void showMessageBox(String sTitle, String sMessage) { + private void showMessageBox(String sTitle, String sMessage) { if ( null != m_xFrame && null != m_xToolkit ) { // describe window properties. diff --git a/odk/examples/DevelopersGuide/Database/RowSet.java b/odk/examples/DevelopersGuide/Database/RowSet.java index c19dcdc681b7..9b67a5078613 100644 --- a/odk/examples/DevelopersGuide/Database/RowSet.java +++ b/odk/examples/DevelopersGuide/Database/RowSet.java @@ -86,7 +86,7 @@ public class RowSet System.out.println(aNames[i]); } - public static void useRowSet() throws com.sun.star.uno.Exception + private static void useRowSet() throws com.sun.star.uno.Exception { // first we create our RowSet object XRowSet xRowRes = UnoRuntime.queryInterface( @@ -109,7 +109,7 @@ public class RowSet System.out.println("RowSet destroyed!"); } - public static void showRowSetPrivileges() throws com.sun.star.uno.Exception + private static void showRowSetPrivileges() throws com.sun.star.uno.Exception { // first we create our RowSet object XRowSet xRowRes = UnoRuntime.queryInterface( @@ -143,7 +143,7 @@ public class RowSet System.out.println("RowSet destroyed!"); } - public static void showRowSetRowCount() throws com.sun.star.uno.Exception + private static void showRowSetRowCount() throws com.sun.star.uno.Exception { // first we create our RowSet object XRowSet xRowRes = UnoRuntime.queryInterface( @@ -175,7 +175,7 @@ public class RowSet System.out.println("RowSet destroyed!"); } - public static void showRowSetEvents() throws com.sun.star.uno.Exception + private static void showRowSetEvents() throws com.sun.star.uno.Exception { // first we create our RowSet object XRowSet xRowRes = UnoRuntime.queryInterface( diff --git a/odk/examples/DevelopersGuide/Database/Sales.java b/odk/examples/DevelopersGuide/Database/Sales.java index 12f68e9f6b45..a18b0cd85745 100644 --- a/odk/examples/DevelopersGuide/Database/Sales.java +++ b/odk/examples/DevelopersGuide/Database/Sales.java @@ -142,7 +142,7 @@ public class Sales } // inserts a row programmatically. - public void insertRow() throws com.sun.star.uno.Exception + private void insertRow() throws com.sun.star.uno.Exception { // example for a programmatic way to do updates. XStatement stmt = con.createStatement(); @@ -170,7 +170,7 @@ public class Sales } // deletes a row programmatically. - public void deleteRow() throws com.sun.star.uno.Exception + private void deleteRow() throws com.sun.star.uno.Exception { // example for a programmatic way to do updates. XStatement stmt = con.createStatement(); diff --git a/odk/examples/DevelopersGuide/Forms/ControlLock.java b/odk/examples/DevelopersGuide/Forms/ControlLock.java index 665eecc8d9a1..2663cd52f00f 100644 --- a/odk/examples/DevelopersGuide/Forms/ControlLock.java +++ b/odk/examples/DevelopersGuide/Forms/ControlLock.java @@ -130,7 +130,7 @@ class ControlLock implements XRowSetListener /* ------------------------------------------------------------------ */ /** updates the locks on the affected controls */ - protected void updateLocks( ) + private void updateLocks( ) { try { diff --git a/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java b/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java index fbb1933387aa..b59e5d482456 100644 --- a/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java +++ b/odk/examples/DevelopersGuide/Forms/DocumentBasedExample.java @@ -115,7 +115,7 @@ public abstract class DocumentBasedExample implements com.sun.star.lang.XEventLi /* ------------------------------------------------------------------ */ /** collect the RuntimeArguments */ - protected void collectParameters(String argv[]) + private void collectParameters(String argv[]) { // not interested in. Derived classes may want to use it. } diff --git a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java index 6b9518631396..ec772949cfc4 100644 --- a/odk/examples/DevelopersGuide/Forms/DocumentHelper.java +++ b/odk/examples/DevelopersGuide/Forms/DocumentHelper.java @@ -120,7 +120,7 @@ public class DocumentHelper The initial name of the form. May be null, in this case the default (which is an implementation detail) applies. */ - protected XIndexContainer createSubForm( XIndexContainer xParentContainer, String sInitialName ) + private XIndexContainer createSubForm( XIndexContainer xParentContainer, String sInitialName ) throws com.sun.star.uno.Exception { // create a new form @@ -196,7 +196,7 @@ public class DocumentHelper /* ------------------------------------------------------------------ */ /** returns a URL which can be used to create a document of a certain type */ - public static String getDocumentFactoryURL( DocumentType eType ) + private static String getDocumentFactoryURL( DocumentType eType ) { if ( eType == DocumentType.WRITER ) return "private:factory/swriter"; diff --git a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java index ca4f437530f8..75948937b448 100644 --- a/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java +++ b/odk/examples/DevelopersGuide/Forms/DocumentViewHelper.java @@ -69,7 +69,7 @@ class DocumentViewHelper @param aInterfaceClass the class of the interface which shall be returned */ - public <T> T get( Class<T> aInterfaceClass ) + private <T> T get( Class<T> aInterfaceClass ) { return UnoRuntime.queryInterface( aInterfaceClass, m_controller ); } @@ -83,7 +83,7 @@ class DocumentViewHelper @return the dispatcher for the URL in question */ - public XDispatch getDispatcher( URL[] aURL ) throws java.lang.Exception + private XDispatch getDispatcher( URL[] aURL ) throws java.lang.Exception { XDispatch xReturn = null; @@ -130,7 +130,7 @@ class DocumentViewHelper @return the control tied to the model */ - public XControl getFormControl( XControlModel xModel ) throws com.sun.star.uno.Exception + private XControl getFormControl( XControlModel xModel ) throws com.sun.star.uno.Exception { // the current view of the document XControlAccess xCtrlAcc = get( XControlAccess.class ); diff --git a/odk/examples/DevelopersGuide/Forms/FLTools.java b/odk/examples/DevelopersGuide/Forms/FLTools.java index e04500aa43d6..614d72790d27 100644 --- a/odk/examples/DevelopersGuide/Forms/FLTools.java +++ b/odk/examples/DevelopersGuide/Forms/FLTools.java @@ -76,7 +76,7 @@ public class FLTools /* ------------------------------------------------------------------ */ /** returns the name of the given form component */ - public static String getName( Object aFormComponent ) + private static String getName( Object aFormComponent ) { XNamed xNamed = UnoRuntime.queryInterface( XNamed.class, aFormComponent ); @@ -159,7 +159,7 @@ public class FLTools /* ------------------------------------------------------------------ */ /** retrieves the parent of the given object */ - static <T> T getParent( Object aComponent, Class<T> aInterfaceClass ) + private static <T> T getParent( Object aComponent, Class<T> aInterfaceClass ) { XChild xAsChild = UnoRuntime.queryInterface( XChild.class, aComponent ); diff --git a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java index 5c15718706a7..29593b04cbae 100644 --- a/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java +++ b/odk/examples/DevelopersGuide/Forms/HsqlDatabase.java @@ -98,7 +98,7 @@ public class HsqlDatabase * the ownership of the connection, so you don't need to (and should not) dispose/close it. * */ - public XConnection defaultConnection() throws SQLException + private XConnection defaultConnection() throws SQLException { if ( m_connection != null ) return m_connection; @@ -131,7 +131,7 @@ public class HsqlDatabase * Any CloseVetoExceptions fired by third parties are ignored, and any reference to the * database document is released. */ - public void close() + private void close() { // close connection XCloseable closeConn = UnoRuntime.queryInterface( XCloseable.class, @@ -166,7 +166,7 @@ public class HsqlDatabase /** closes the document, and deletes the underlying file */ - public void closeAndDelete() + private void closeAndDelete() { close(); diff --git a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java index 440fc4406c1b..2e00c842ce81 100644 --- a/odk/examples/DevelopersGuide/Forms/KeyGenerator.java +++ b/odk/examples/DevelopersGuide/Forms/KeyGenerator.java @@ -54,7 +54,7 @@ class UniqueColumnValue themself are based on one table.<br/> Everything else (especially forms based on queries) is not yet implemented.</p> */ - protected String extractTableName( XPropertySet xForm ) throws com.sun.star.uno.Exception + private String extractTableName( XPropertySet xForm ) throws com.sun.star.uno.Exception { String sReturn; @@ -99,7 +99,7 @@ class UniqueColumnValue a String which can be used as statement to retrieve a unique value for the given column. The result set resulting from such a execution contains the value in it's first column. */ - protected String composeUniqueyKeyStatement( XPropertySet xForm, String sFieldName ) throws com.sun.star.uno.Exception + private String composeUniqueyKeyStatement( XPropertySet xForm, String sFieldName ) throws com.sun.star.uno.Exception { String sStatement = new String( "SELECT MAX( " ); sStatement += sFieldName; @@ -123,7 +123,7 @@ class UniqueColumnValue @param sFieldName the name of the column */ - protected int generatePrimaryKey( XPropertySet xForm, String sFieldName ) throws com.sun.star.uno.Exception + private int generatePrimaryKey( XPropertySet xForm, String sFieldName ) throws com.sun.star.uno.Exception { // get the current connection of the form XConnection xConn = UnoRuntime.queryInterface( @@ -202,7 +202,7 @@ class KeyGeneratorForReset extends UniqueColumnValue implements XResetListener /** sets the focus to the first control which is no fixed text, and not the one we're defaulting */ - public void defaultNewRecordFocus( XPropertySet xForm ) throws com.sun.star.uno.Exception + private void defaultNewRecordFocus( XPropertySet xForm ) throws com.sun.star.uno.Exception { XIndexAccess xFormAsContainer = UnoRuntime.queryInterface( XIndexAccess.class, xForm ); diff --git a/odk/examples/DevelopersGuide/Forms/SalesFilter.java b/odk/examples/DevelopersGuide/Forms/SalesFilter.java index 6aae1a05f6aa..aad8b13b106b 100644 --- a/odk/examples/DevelopersGuide/Forms/SalesFilter.java +++ b/odk/examples/DevelopersGuide/Forms/SalesFilter.java @@ -121,7 +121,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis = helper ================================================================== */ /* ------------------------------------------------------------------ */ - protected void initFilterDates() + private void initFilterDates() { m_aFilterDates.clear(); java.util.Date aNowAndHere = new java.util.Date(); @@ -162,7 +162,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis /** translates a date from the AWT Toolkit format to a java.util.date, or vice versa. */ - protected Object translateDate( Object aDate ) throws java.lang.Exception + private Object translateDate( Object aDate ) throws java.lang.Exception { Object aReturn = null; @@ -201,7 +201,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis /** translates the given date into the ODBC date notation, which then can be used for setting a filter at a row set */ - protected String getOdbcDate( Object aDate ) throws java.lang.Exception + private String getOdbcDate( Object aDate ) throws java.lang.Exception { String sOdbcDate = ""; if ( null != aDate ) @@ -235,7 +235,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis } /* ------------------------------------------------------------------ */ - protected void updateApplyButton() + private void updateApplyButton() { try { @@ -251,7 +251,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis /* ------------------------------------------------------------------ */ /** creates a normalized calendar object from the given java.util.Date */ - protected GregorianCalendar getCalendarObject( java.util.Date aDate ) + private GregorianCalendar getCalendarObject( java.util.Date aDate ) { // the date part GregorianCalendar aReturn = null; @@ -270,7 +270,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis } /* ------------------------------------------------------------------ */ - final protected short getCurrentSelectedFilter( ) throws com.sun.star.uno.Exception + final private short getCurrentSelectedFilter( ) throws com.sun.star.uno.Exception { short[] aSelected = (short[])m_xFilterList.getPropertyValue( "SelectedItems" ); if ( 0 < aSelected.length ) @@ -282,13 +282,13 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis /** checks if the given filter index referes to the "<other>" entry which allows the user to manually enter a date */ - final protected boolean isManualFilter( short nFilterIndex ) + final private boolean isManualFilter( short nFilterIndex ) { return ( 5 == nFilterIndex ); } /* ------------------------------------------------------------------ */ - protected void updateFilterControl() + private void updateFilterControl() { try { @@ -336,7 +336,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis seems to always return false, as well as . Thus here is a method which compare two calendars, restricted to their date part</p> */ - protected boolean equalDate( Calendar aLHS, Calendar aRHS ) + private boolean equalDate( Calendar aLHS, Calendar aRHS ) { if ( ( null == aLHS ) != ( null == aRHS ) ) // only one of them is null @@ -356,7 +356,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis @return the index of the newly added date filter in the filter list */ - protected short addCurrentFilter( ) throws java.lang.Exception + private short addCurrentFilter( ) throws java.lang.Exception { // the current string items String[] aOldFilterItems = (String[])m_xFilterList.getPropertyValue( "StringItemList" ); @@ -405,7 +405,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis } /* ------------------------------------------------------------------ */ - protected void executeCurrentFilter() + private void executeCurrentFilter() { try { diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index fc67ea18c166..345c70b59c2e 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -188,7 +188,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XNameAccess getRegistryKeyContent(String _sKeyName){ + private XNameAccess getRegistryKeyContent(String _sKeyName){ try { PropertyValue[] aNodePath = new PropertyValue[1]; XMultiServiceFactory xMSFConfig = theDefaultProvider.get(m_xContext); @@ -310,7 +310,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis * dialog, using the given * peer as a parent. */ - public XWindowPeer createWindowPeer(XWindowPeer _xWindowParentPeer) { + private XWindowPeer createWindowPeer(XWindowPeer _xWindowParentPeer) { try{ if (_xWindowParentPeer == null){ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, m_xDlgContainer); @@ -371,7 +371,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XFixedText insertFixedText(XMouseListener _xMouseListener, int _nPosX, int _nPosY, int _nWidth, int _nStep, String _sLabel){ + private XFixedText insertFixedText(XMouseListener _xMouseListener, int _nPosX, int _nPosY, int _nWidth, int _nStep, String _sLabel){ XFixedText xFixedText = null; try{ // create a unique name by means of an own implementation... @@ -414,7 +414,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XTextComponent insertCurrencyField(XTextListener _xTextListener, int _nPositionX, int _nPositionY, int _nWidth){ + private XTextComponent insertCurrencyField(XTextListener _xTextListener, int _nPositionX, int _nPositionY, int _nWidth){ XTextComponent xTextComponent = null; try{ // create a unique name by means of an own implementation... @@ -460,7 +460,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public XPropertySet insertProgressBar(int _nPosX, int _nPosY, int _nWidth, int _nProgressMax){ + private XPropertySet insertProgressBar(int _nPosX, int _nPosY, int _nWidth, int _nProgressMax){ XPropertySet xPBModelPSet = null; try{ // create a unique name by means of an own implementation... @@ -537,7 +537,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public void insertGroupBox(int _nPosX, int _nPosY, int _nHeight, int _nWidth){ + private void insertGroupBox(int _nPosX, int _nPosY, int _nHeight, int _nWidth){ try{ // create a unique name by means of an own implementation... String sName = createUniqueName(m_xDlgModelNameContainer, "FrameControl"); @@ -574,7 +574,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public XTextComponent insertEditField(XTextListener _xTextListener, XFocusListener _xFocusListener, int _nPosX, int _nPosY, int _nWidth){ + private XTextComponent insertEditField(XTextListener _xTextListener, XFocusListener _xFocusListener, int _nPosX, int _nPosY, int _nWidth){ XTextComponent xTextComponent = null; try{ // create a unique name by means of an own implementation... @@ -619,7 +619,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis return xTextComponent; } - public XPropertySet insertTimeField(int _nPosX, int _nPosY, int _nWidth, Time _aTime, Time _aTimeMin, Time _aTimeMax){ + private XPropertySet insertTimeField(int _nPosX, int _nPosY, int _nWidth, Time _aTime, Time _aTimeMin, Time _aTimeMax){ XPropertySet xTFModelPSet = null; try{ // create a unique name by means of an own implementation... @@ -661,7 +661,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public XPropertySet insertDateField(XSpinListener _xSpinListener, int _nPosX, int _nPosY, int _nWidth){ + private XPropertySet insertDateField(XSpinListener _xSpinListener, int _nPosX, int _nPosY, int _nWidth){ XPropertySet xDFModelPSet = null; try{ // create a unique name by means of an own implementation... @@ -707,7 +707,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XPropertySet insertPatternField(int _nPosX, int _nPosY, int _nWidth){ + private XPropertySet insertPatternField(int _nPosX, int _nPosY, int _nWidth){ XPropertySet xPFModelPSet = null; try{ // create a unique name by means of an own implementation... @@ -749,7 +749,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XPropertySet insertNumericField( int _nPosX, int _nPosY, int _nWidth, + private XPropertySet insertNumericField( int _nPosX, int _nPosY, int _nWidth, double _fValueMin, double _fValueMax, double _fValue, double _fValueStep, short _nDecimalAccuracy){ XPropertySet xNFModelPSet = null; @@ -793,7 +793,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public XPropertySet insertVerticalScrollBar(XAdjustmentListener _xAdjustmentListener, int _nPosX, int _nPosY, int _nHeight){ + private XPropertySet insertVerticalScrollBar(XAdjustmentListener _xAdjustmentListener, int _nPosX, int _nPosY, int _nHeight){ XPropertySet xSBModelPSet = null; try{ // create a unique name by means of an own implementation... @@ -861,7 +861,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XCheckBox insertCheckBox(XItemListener _xItemListener, int _nPosX, int _nPosY, int _nWidth){ + private XCheckBox insertCheckBox(XItemListener _xItemListener, int _nPosX, int _nPosY, int _nWidth){ XCheckBox xCheckBox = null; try{ // create a unique name by means of an own implementation... @@ -906,7 +906,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public void insertRadioButtonGroup(short _nTabIndex, int _nPosX, int _nPosY, int _nWidth){ + private void insertRadioButtonGroup(short _nTabIndex, int _nPosX, int _nPosY, int _nWidth){ try{ // create a unique name by means of an own implementation... String sName = createUniqueName(m_xDlgModelNameContainer, "OptionButton"); @@ -947,7 +947,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XListBox insertListBox(int _nPosX, int _nPosY, int _nWidth, int _nStep, String[] _sStringItemList){ + private XListBox insertListBox(int _nPosX, int _nPosY, int _nWidth, int _nStep, String[] _sStringItemList){ XListBox xListBox = null; try{ // create a unique name by means of an own implementation... @@ -987,7 +987,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XComboBox insertComboBox(int _nPosX, int _nPosY, int _nWidth){ + private XComboBox insertComboBox(int _nPosX, int _nPosY, int _nWidth){ XComboBox xComboBox = null; try{ // create a unique name by means of an own implementation... @@ -1032,7 +1032,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis - public XPropertySet insertFormattedField(XSpinListener _xSpinListener, int _nPosX, int _nPosY, int _nWidth){ + private XPropertySet insertFormattedField(XSpinListener _xSpinListener, int _nPosX, int _nPosY, int _nWidth){ XPropertySet xFFModelPSet = null; try{ // create a unique name by means of an own implementation... @@ -1099,7 +1099,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis } - public XTextComponent insertFileControl(XTextListener _xTextListener, int _nPosX, int _nPosY, int _nWidth){ + private XTextComponent insertFileControl(XTextListener _xTextListener, int _nPosX, int _nPosY, int _nWidth){ XTextComponent xTextComponent = null; try{ // create a unique name by means of an own implementation... diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu.java b/odk/examples/DevelopersGuide/GUI/UnoMenu.java index 8f915bdb2761..dcedef25482c 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoMenu.java +++ b/odk/examples/DevelopersGuide/GUI/UnoMenu.java @@ -90,7 +90,7 @@ public UnoMenu(XComponentContext _xContext, XMultiComponentFactory _xMCF) { } - public void addMenuBar(XTopWindow _xTopWindow, XMenuListener _xMenuListener){ + private void addMenuBar(XTopWindow _xTopWindow, XMenuListener _xMenuListener){ try{ // create a menubar at the global MultiComponentFactory... Object oMenuBar = m_xMCF.createInstanceWithContext("com.sun.star.awt.MenuBar", m_xContext); @@ -115,7 +115,7 @@ public UnoMenu(XComponentContext _xContext, XMultiComponentFactory _xMCF) { System.exit( 0 ); } - public XTopWindow showTopWindow( Rectangle _aRectangle){ + private XTopWindow showTopWindow( Rectangle _aRectangle){ XTopWindow xTopWindow = null; try { // The Toolkit is the creator of all windows... diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java index 92dcacbab235..002c6442974f 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java @@ -271,7 +271,7 @@ public class DocumentView extends JFrame - public void save() + private void save() { com.sun.star.frame.XController xController = mxFrame.getController(); if (xController==null) @@ -284,7 +284,7 @@ public class DocumentView extends JFrame - public void exportHTML(String sURL) + private void exportHTML(String sURL) { com.sun.star.frame.XController xController = mxFrame.getController(); if (xController==null) diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java index af180b8cbfbe..77b48abb99e4 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java @@ -291,7 +291,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener, * @param aEvent * describes the action */ - public void impl_frameAction(/*IN*/ com.sun.star.frame.FrameActionEvent aEvent) + private void impl_frameAction(/*IN*/ com.sun.star.frame.FrameActionEvent aEvent) { synchronized(this) { @@ -491,7 +491,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener, * @param lArguments * optional arguments for loading */ - public void impl_dispatch(/*IN*/ com.sun.star.util.URL aURL,/*IN*/ com.sun.star.beans.PropertyValue[] lArguments) + private void impl_dispatch(/*IN*/ com.sun.star.util.URL aURL,/*IN*/ com.sun.star.beans.PropertyValue[] lArguments) { synchronized(this) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java index 7b409921ec11..317022d8190c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java @@ -316,7 +316,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, * @param aEvent * describes the action */ - public void impl_frameAction(/*IN*/ com.sun.star.frame.FrameActionEvent aEvent) + private void impl_frameAction(/*IN*/ com.sun.star.frame.FrameActionEvent aEvent) { synchronized(this) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java index 9bc3e57e83ef..fdc82ea24e6d 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java @@ -174,7 +174,7 @@ public class ViewContainer extends Thread - public void removeListener( IShutdownListener rListener ) + private void removeListener( IShutdownListener rListener ) { synchronized(mlListener) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java index da283d365b98..5d6e9a3dda5b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java @@ -114,7 +114,7 @@ public class FilterOptions * @param lDescriptor * the new MediaDescriptor to set internal member from it */ - public void analyze( boolean bImport , + private void analyze( boolean bImport , com.sun.star.beans.PropertyValue[] lDescriptor ) { m_xInput = null ; diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java index 2352ff8cceeb..c1ab8438467b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java @@ -114,7 +114,7 @@ public class PropChgHelper implements } } - public void RemoveAsListener() + private void RemoveAsListener() { if (xPropSet != null) { diff --git a/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java b/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java index 9865734d1e35..95fb3e98413a 100644 --- a/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java +++ b/odk/examples/DevelopersGuide/UCB/DataStreamRetriever.java @@ -117,7 +117,7 @@ public class DataStreamRetriever { * *@param args Arguments */ - public void parseArguments( String[] args ) throws java.lang.Exception { + private void parseArguments( String[] args ) throws java.lang.Exception { for ( int i = 0; i < args.length; i++ ) { if ( args[i].startsWith( "-url=" )) { @@ -137,7 +137,7 @@ public class DataStreamRetriever { /** * Print the commands options */ - public void printCmdLineUsage() { + private void printCmdLineUsage() { System.out.println( "Usage : DataStreamRetriever -url=..." ); System.out.println( @@ -149,7 +149,7 @@ public class DataStreamRetriever { /** * Print Stream content. */ - public void printStream( XInputStream data ) + private void printStream( XInputStream data ) throws com.sun.star.uno.Exception { diff --git a/odk/examples/DevelopersGuide/UCB/Helper.java b/odk/examples/DevelopersGuide/UCB/Helper.java index fe427a902930..015e6976e264 100644 --- a/odk/examples/DevelopersGuide/UCB/Helper.java +++ b/odk/examples/DevelopersGuide/UCB/Helper.java @@ -93,7 +93,7 @@ public class Helper { *@param connectURL Connect URL. Example : -url=file:/// *@return Created identifier object for given URL */ - public XContent createUCBContent( String connectURL ) throws java.lang.Exception { + private XContent createUCBContent( String connectURL ) throws java.lang.Exception { XContent content = null; if ( connectURL != null && !connectURL.equals( "" )) { diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java index 059526184202..80a09136986b 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java @@ -66,7 +66,7 @@ public final class OwnEmbeddedObject extends WeakBase private Dimension m_aObjSize; - protected ArrayList<Object> GetListeners() + private ArrayList<Object> GetListeners() { if ( m_aListeners == null ) m_aListeners = new ArrayList<Object>(10); @@ -75,7 +75,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected Dimension UpdateSizeAndGetFromActive() + private Dimension UpdateSizeAndGetFromActive() { if ( m_nObjectState == com.sun.star.embed.EmbedStates.ACTIVE ) m_aObjSize = m_aEditorFrame.getAppSize(); @@ -87,7 +87,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected void SwitchOwnPersistence( XStorage xParentStorage, XStorage xOwnStorage, String aEntryName ) + private void SwitchOwnPersistence( XStorage xParentStorage, XStorage xOwnStorage, String aEntryName ) { if ( xOwnStorage != m_xOwnStorage ) { @@ -100,7 +100,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected void SwitchOwnPersistence( XStorage xParentStorage, String aEntryName ) throws com.sun.star.io.IOException + private void SwitchOwnPersistence( XStorage xParentStorage, String aEntryName ) throws com.sun.star.io.IOException { if ( xParentStorage != m_xParentStorage || !aEntryName.equals( m_aEntryName ) ) { @@ -125,7 +125,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected static void SaveDataToStorage( XStorage xStorage, String aString, Dimension aDimension ) throws com.sun.star.io.IOException + private static void SaveDataToStorage( XStorage xStorage, String aString, Dimension aDimension ) throws com.sun.star.io.IOException { try { @@ -185,7 +185,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected void PostEvent( String aEvEntryName ) + private void PostEvent( String aEvEntryName ) { if ( m_aListeners != null ) { @@ -208,7 +208,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected void StateChangeNotification( boolean bBeforeChange, int nOldState, int nNewState ) + private void StateChangeNotification( boolean bBeforeChange, int nOldState, int nNewState ) { if ( m_aListeners != null ) { @@ -236,7 +236,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected String ReadStringFromStream( XStorage xStorage, String aStreamName ) throws com.sun.star.io.IOException + private String ReadStringFromStream( XStorage xStorage, String aStreamName ) throws com.sun.star.io.IOException { if ( xStorage == null ) throw new com.sun.star.uno.RuntimeException(); @@ -281,7 +281,7 @@ public final class OwnEmbeddedObject extends WeakBase } - protected void ReadSizeFromOwnStorage() throws com.sun.star.io.IOException + private void ReadSizeFromOwnStorage() throws com.sun.star.io.IOException { String aSize = ReadStringFromStream( m_xOwnStorage, "properties.txt" ); diff --git a/odk/examples/java/Inspector/HideableTreeModel.java b/odk/examples/java/Inspector/HideableTreeModel.java index 0184e24b8aed..7add3d723cd7 100644 --- a/odk/examples/java/Inspector/HideableTreeModel.java +++ b/odk/examples/java/Inspector/HideableTreeModel.java @@ -44,12 +44,12 @@ public class HideableTreeModel implements TreeModel { } - protected void setRoot(Object r) { + private void setRoot(Object r) { this.root = r; } - public Object[] getPathToRoot(Object node) { + private Object[] getPathToRoot(Object node) { return getPathToRoot(node, 0); } @@ -89,7 +89,7 @@ public class HideableTreeModel implements TreeModel { } - public void reload(Object node) { + private void reload(Object node) { if(node != null) { TreePath tp = new TreePath(getPathToRoot(node)); fireTreeStructureChanged(new TreeModelEvent(this, tp)); @@ -119,7 +119,7 @@ public class HideableTreeModel implements TreeModel { } - public void nodeRemoved(Object node, Object child, int index) { + private void nodeRemoved(Object node, Object child, int index) { if(node != null && child != null && index >= 0) { TreePath tp = new TreePath(getPathToRoot(node)); int[] ai = { index }; @@ -137,27 +137,27 @@ public class HideableTreeModel implements TreeModel { } - protected void fireTreeNodesChanged(TreeModelEvent event) { + private void fireTreeNodesChanged(TreeModelEvent event) { for(TreeModelListener l : modelListeners) { l.treeNodesChanged(event); } } - protected void fireTreeNodesInserted(TreeModelEvent event) { + private void fireTreeNodesInserted(TreeModelEvent event) { for(TreeModelListener l : modelListeners) { l.treeNodesInserted(event); } } - protected void fireTreeNodesRemoved(TreeModelEvent event) { + private void fireTreeNodesRemoved(TreeModelEvent event) { for(TreeModelListener l : modelListeners) { l.treeNodesRemoved(event); } } - protected void fireTreeStructureChanged(TreeModelEvent event) { + private void fireTreeStructureChanged(TreeModelEvent event) { for(TreeModelListener l : modelListeners) { l.treeStructureChanged(event); } @@ -197,7 +197,7 @@ public class HideableTreeModel implements TreeModel { - public Object getParent(Object node) { + private Object getParent(Object node) { if(node != getRoot() && (node instanceof TreeNode)) { return ((TreeNode)node).getParent(); } @@ -205,7 +205,7 @@ public class HideableTreeModel implements TreeModel { } - public boolean isNodeVisible(Object node) { + private boolean isNodeVisible(Object node) { if(node != getRoot()) { if(node instanceof HideableMutableTreeNode) { return ((HideableMutableTreeNode)node).isVisible(); diff --git a/odk/examples/java/Inspector/Inspector.java b/odk/examples/java/Inspector/Inspector.java index 80fc6598d888..a537d9c77941 100644 --- a/odk/examples/java/Inspector/Inspector.java +++ b/odk/examples/java/Inspector/Inspector.java @@ -111,7 +111,7 @@ public class Inspector{ } - protected String getSDKPath(){ + private String getSDKPath(){ String sRetPath = ""; try{ XNameAccess xNameAccess = getConfigurationAccess("org.openoffice.inspector.ObjectInspector", true); @@ -184,7 +184,7 @@ public class Inspector{ }} - public void showErrorMessageBox(XWindowPeer _xWindowPeer, String _sTitle, String _sMessage){ + private void showErrorMessageBox(XWindowPeer _xWindowPeer, String _sTitle, String _sMessage){ try { Object oToolkit = m_xComponentContext.getServiceManager().createInstanceWithContext("com.sun.star.awt.Toolkit", m_xComponentContext); XMessageBoxFactory xMessageBoxFactory = UnoRuntime.queryInterface(XMessageBoxFactory.class, oToolkit); @@ -336,7 +336,7 @@ public class Inspector{ } - public static String[] getServiceNames() { + private static String[] getServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } @@ -391,12 +391,12 @@ public class Inspector{ } - public XNameAccess getConfigurationAccess(boolean _bUpdate){ + private XNameAccess getConfigurationAccess(boolean _bUpdate){ return getConfigurationAccess("org.openoffice.inspector.ObjectInspector", _bUpdate); } - public XNameAccess getConfigurationAccess(String _sNodePath, boolean update) { + private XNameAccess getConfigurationAccess(String _sNodePath, boolean update) { XNameAccess xNameAccess = null; try { String sAccess = ""; diff --git a/odk/examples/java/Inspector/InspectorAddon.java b/odk/examples/java/Inspector/InspectorAddon.java index 3846085d2521..fee4f1dcbd4d 100644 --- a/odk/examples/java/Inspector/InspectorAddon.java +++ b/odk/examples/java/Inspector/InspectorAddon.java @@ -150,7 +150,7 @@ public class InspectorAddon { } - public static String[] getServiceNames() { + private static String[] getServiceNames() { return m_serviceNames; } diff --git a/odk/examples/java/Inspector/InspectorPane.java b/odk/examples/java/Inspector/InspectorPane.java index 27cbf50b1d8e..eae2195468cb 100644 --- a/odk/examples/java/Inspector/InspectorPane.java +++ b/odk/examples/java/Inspector/InspectorPane.java @@ -234,7 +234,7 @@ import com.sun.star.uno.XComponentContext; - public void addMethodsToTreeNode(XUnoNode _oGrandParentNode, Object _oUnoParentObject, XIdlMethod[] _xIdlMethods){ + private void addMethodsToTreeNode(XUnoNode _oGrandParentNode, Object _oUnoParentObject, XIdlMethod[] _xIdlMethods){ if (Introspector.isValid(_xIdlMethods)){ for ( int n = 0; n < _xIdlMethods.length; n++ ) { XIdlMethod xIdlMethod = _xIdlMethods[n]; @@ -335,7 +335,7 @@ import com.sun.star.uno.XComponentContext; }} - public void addContainerElementsToTreeNode(XUnoNode _oParentNode, Object _oUnoParentObject){ + private void addContainerElementsToTreeNode(XUnoNode _oParentNode, Object _oUnoParentObject){ Object[] oUnoContainerElements = m_oIntrospector.getUnoObjectsOfContainer(_oUnoParentObject); if (Introspector.isValid(oUnoContainerElements)){ if (oUnoContainerElements.length > 0){ diff --git a/odk/examples/java/Inspector/Introspector.java b/odk/examples/java/Inspector/Introspector.java index ca335a3bfe38..e3cfc97e47d6 100644 --- a/odk/examples/java/Inspector/Introspector.java +++ b/odk/examples/java/Inspector/Introspector.java @@ -119,7 +119,7 @@ public class Introspector extends WeakBase{ } - protected XMultiComponentFactory getXMultiComponentFactory(){ + private XMultiComponentFactory getXMultiComponentFactory(){ return m_xMultiComponentFactory; } @@ -357,7 +357,7 @@ public class Introspector extends WeakBase{ } - protected void initTypeDescriptionManager() { + private void initTypeDescriptionManager() { try { Object oTypeDescriptionManager = getXComponentContext().getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager"); m_xTDEnumerationAccess = UnoRuntime.queryInterface(XTypeDescriptionEnumerationAccess.class, oTypeDescriptionManager); @@ -366,7 +366,7 @@ public class Introspector extends WeakBase{ }} - protected XTypeDescriptionEnumerationAccess getXTypeDescriptionEnumerationAccess(){ + private XTypeDescriptionEnumerationAccess getXTypeDescriptionEnumerationAccess(){ return m_xTDEnumerationAccess; } @@ -447,7 +447,7 @@ public class Introspector extends WeakBase{ } - public XInterfaceTypeDescription[] getInterfaceDescriptionsOfService(String _sServiceName){ + private XInterfaceTypeDescription[] getInterfaceDescriptionsOfService(String _sServiceName){ try { XServiceTypeDescription xServiceTypeDescription = getServiceTypeDescription(_sServiceName, com.sun.star.uno.TypeClass.INTERFACE); if (xServiceTypeDescription != null){ @@ -461,7 +461,7 @@ public class Introspector extends WeakBase{ } - static boolean hasByName(XTypeDescription[] _xTypeDescriptions, String _sTypeName){ + private static boolean hasByName(XTypeDescription[] _xTypeDescriptions, String _sTypeName){ for (int i = 0; i < _xTypeDescriptions.length; i++){ if (_xTypeDescriptions[i].getName().equals(_sTypeName)){ return true; @@ -508,7 +508,7 @@ public class Introspector extends WeakBase{ } - public static boolean isOfUnoType(Object _oUnoObject, String _sTypeName){ + private static boolean isOfUnoType(Object _oUnoObject, String _sTypeName){ boolean bIsUnoObject = false; if (_oUnoObject != null){ if (_oUnoObject.getClass().isArray()){ diff --git a/odk/examples/java/Inspector/MethodParametersDialog.java b/odk/examples/java/Inspector/MethodParametersDialog.java index 6181d0503420..7ce38be09647 100644 --- a/odk/examples/java/Inspector/MethodParametersDialog.java +++ b/odk/examples/java/Inspector/MethodParametersDialog.java @@ -335,7 +335,7 @@ public class MethodParametersDialog extends JDialog{ } - public void invokeParameterMethod(){ + private void invokeParameterMethod(){ try{ Object[] oParameters = getParameterValues(); m_oUnoReturnObject = m_xUnoMethodNode.invoke(m_oUnoObject, oParameters); diff --git a/odk/examples/java/Inspector/ProtocolHandlerAddon.java b/odk/examples/java/Inspector/ProtocolHandlerAddon.java index 37dfc1411c39..1515759b4000 100644 --- a/odk/examples/java/Inspector/ProtocolHandlerAddon.java +++ b/odk/examples/java/Inspector/ProtocolHandlerAddon.java @@ -118,7 +118,7 @@ public class ProtocolHandlerAddon { return getServiceNames(); } - public static String[] getServiceNames() { + private static String[] getServiceNames() { return m_serviceNames; } @@ -202,7 +202,7 @@ public class ProtocolHandlerAddon { /*IN*/com.sun.star.util.URL aURL ) { } - public void showMessageBox(String sTitle, String sMessage) { + private void showMessageBox(String sTitle, String sMessage) { if ( null != m_xFrame && null != m_xToolkit ) { // describe window properties. diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java index 2ba84790ac95..165d917330cd 100644 --- a/odk/examples/java/Inspector/SourceCodeGenerator.java +++ b/odk/examples/java/Inspector/SourceCodeGenerator.java @@ -251,7 +251,7 @@ public class SourceCodeGenerator { } - public String getPropertyStatementSourceCode(XUnoPropertyNode _oUnoPropertyNode, String _sVariableName, UnoObjectDefinition _oUnoReturnObjectDefinition){ + private String getPropertyStatementSourceCode(XUnoPropertyNode _oUnoPropertyNode, String _sVariableName, UnoObjectDefinition _oUnoReturnObjectDefinition){ String sReturnObjectVariableDefinition = ""; String sStatement = ""; String sPropertyName = _oUnoPropertyNode.getProperty().Name; @@ -274,7 +274,7 @@ public class SourceCodeGenerator { } - public String getMethodStatementSourceCode(XUnoMethodNode _oUnoMethodNode, String _sVariableName, UnoObjectDefinition _oUnoReturnObjectDefinition){ + private String getMethodStatementSourceCode(XUnoMethodNode _oUnoMethodNode, String _sVariableName, UnoObjectDefinition _oUnoReturnObjectDefinition){ String sReturnObjectVariableDefinition = ""; String sStatement = ""; XIdlMethod xIdlMethod = _oUnoMethodNode.getXIdlMethod(); @@ -519,7 +519,7 @@ public class SourceCodeGenerator { } - public String getVariableInitialization(UnoObjectDefinition _oUnoObjectDefinition, boolean _bInitialize){ + private String getVariableInitialization(UnoObjectDefinition _oUnoObjectDefinition, boolean _bInitialize){ String sObjectVariableDeclaration = ""; String sVariableName = _oUnoObjectDefinition.getVariableName(); if (isVariableDeclared(_oUnoObjectDefinition, "")){ @@ -649,7 +649,7 @@ private class UnoObjectDefinition{ } - public void addParameterObjects(Object[] _oParameterObjects){ + private void addParameterObjects(Object[] _oParameterObjects){ m_oParameterObjects = _oParameterObjects; } @@ -668,7 +668,7 @@ private class UnoObjectDefinition{ } - public String getVariableStemName(TypeClass _aTypeClass){ + private String getVariableStemName(TypeClass _aTypeClass){ int nTypeClass = _aTypeClass.getValue(); switch(nTypeClass){ case TypeClass.BOOLEAN_value: diff --git a/odk/examples/java/Inspector/SwingDialogProvider.java b/odk/examples/java/Inspector/SwingDialogProvider.java index 5c33a16ac104..42ae6db387ce 100644 --- a/odk/examples/java/Inspector/SwingDialogProvider.java +++ b/odk/examples/java/Inspector/SwingDialogProvider.java @@ -91,12 +91,12 @@ public class SwingDialogProvider implements XDialogProvider{ } - public void addMenuBar(JMenuBar _jMenuBar){ + private void addMenuBar(JMenuBar _jMenuBar){ getDialog().setJMenuBar(_jMenuBar); } - public void removeTabPaneByIndex(int _nIndex){ + private void removeTabPaneByIndex(int _nIndex){ if (_nIndex > -1){ String sSelInspectorPanelTitle = m_jTabbedPane1.getTitleAt(_nIndex); m_jTabbedPane1.remove(_nIndex); @@ -136,7 +136,7 @@ public class SwingDialogProvider implements XDialogProvider{ } - public void removeTabPanes(){ + private void removeTabPanes(){ int nCount = m_jTabbedPane1.getTabCount(); if (nCount > 0){ for (int i = nCount-1; i >= 0; i--){ @@ -145,7 +145,7 @@ public class SwingDialogProvider implements XDialogProvider{ } } - public void removeSelectedTabPane(){ + private void removeSelectedTabPane(){ int nIndex = getTabbedPane().getSelectedIndex(); removeTabPaneByIndex(nIndex); } diff --git a/odk/examples/java/Inspector/TDocSupplier.java b/odk/examples/java/Inspector/TDocSupplier.java index 7f34d13de96d..9c5b8f36d54d 100644 --- a/odk/examples/java/Inspector/TDocSupplier.java +++ b/odk/examples/java/Inspector/TDocSupplier.java @@ -64,12 +64,12 @@ public class TDocSupplier { } - protected XComponentContext getXComponentContext(){ + private XComponentContext getXComponentContext(){ return m_xComponentContext; } - protected XMultiComponentFactory getXMultiComponentFactory(){ + private XMultiComponentFactory getXMultiComponentFactory(){ return m_xMultiComponentFactory; } diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java index cd2ac16c74d9..fa48a25a9dd9 100644 --- a/odk/examples/java/Inspector/UnoNode.java +++ b/odk/examples/java/Inspector/UnoNode.java @@ -79,12 +79,12 @@ public class UnoNode{ } - protected XComponentContext getXComponentContext(){ + private XComponentContext getXComponentContext(){ return m_xComponentContext; } - protected XMultiComponentFactory getXMultiComponentFactory(){ + private XMultiComponentFactory getXMultiComponentFactory(){ return m_xMultiComponentFactory; } diff --git a/odk/examples/java/Inspector/UnoPropertyNode.java b/odk/examples/java/Inspector/UnoPropertyNode.java index cd7882110339..0417f71d16d1 100644 --- a/odk/examples/java/Inspector/UnoPropertyNode.java +++ b/odk/examples/java/Inspector/UnoPropertyNode.java @@ -120,7 +120,7 @@ public class UnoPropertyNode extends UnoNode{ - protected boolean doesServiceSupportProperty(String _sServiceName, String _sPropertyName){ + private boolean doesServiceSupportProperty(String _sServiceName, String _sPropertyName){ try { XPropertyTypeDescription[] xPropertyTypeDescriptions = Introspector.getIntrospector().getPropertyDescriptionsOfService(_sServiceName); for (int i = 0; i < xPropertyTypeDescriptions.length; i++){ @@ -188,7 +188,7 @@ public class UnoPropertyNode extends UnoNode{ return aProperty; } - protected static String getPropertyTypeDescription(Property _aProperty, Object _oUnoObject){ + private static String getPropertyTypeDescription(Property _aProperty, Object _oUnoObject){ return _aProperty.Type.getTypeName() + " " + _aProperty.Name + " = " + _oUnoObject.toString(); } diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java index c96eb816999b..e0c34d4dfe83 100644 --- a/odk/examples/java/MinimalComponent/MinimalComponent.java +++ b/odk/examples/java/MinimalComponent/MinimalComponent.java @@ -107,7 +107,7 @@ public class MinimalComponent { * static component initialisation functions as well as in * getSupportedServiceNames. */ - public static String[] getServiceNames() { + private static String[] getServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index 2da2ded22f84..71a628316daf 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -130,7 +130,7 @@ public class ToDo { return getServiceNames(); } - public static String[] getServiceNames() { + private static String[] getServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } @@ -578,7 +578,7 @@ public class ToDo { * @param gregCal Date to be converted. * @return string (converted gregorian calendar). */ - public String getStringFromGregorianCalendar( GregorianCalendar gregCal ) { + private String getStringFromGregorianCalendar( GregorianCalendar gregCal ) { String sDate = ( gregCal.get( Calendar.MONTH ) + 1 ) + STRING_SEPARATOR + gregCal.get( Calendar.DATE ) // + STRING_SEPARATOR + ( gregCal.get( Calendar.MONTH ) + 1 ) @@ -591,7 +591,7 @@ public class ToDo { * @param sDate String to be converted. * @return The result of the converting of the string. */ - public GregorianCalendar getGregorianCalendarFromString( String sDate ) { + private GregorianCalendar getGregorianCalendarFromString( String sDate ) { int []intDateValue = this.getDateValuesFromString( sDate ); return( new GregorianCalendar( intDateValue[ 2 ], intDateValue[ 0 ], @@ -602,7 +602,7 @@ public class ToDo { * @param sDate String to be parsed. * @return Returns an array of integer variables. */ - public int[] getDateValuesFromString( String sDate) { + private int[] getDateValuesFromString( String sDate) { int[] intDateValues = new int[ 3 ]; int intPositionFirstTag = sDate.indexOf( STRING_SEPARATOR ); @@ -628,7 +628,7 @@ public class ToDo { * @param intColumn Number of column. * @return String from the specified cell. */ - public String getStringFromCell( XCellRange xcellrange, int intRow, + private String getStringFromCell( XCellRange xcellrange, int intRow, int intColumn ) { XTextRange xtextrangeStartDate = null; @@ -653,7 +653,7 @@ public class ToDo { * @param intColumn Number of column. * @param sDate Date to write to the cell. */ - public void setStringToCell( XCellRange xcellrange, int intRow, + private void setStringToCell( XCellRange xcellrange, int intRow, int intColumn, String sDate ) { try { // Getting the cell holding the information on the day to start @@ -675,7 +675,7 @@ public class ToDo { * @param intRow Number of row. * @param intColumn Number of column. */ - public void setDayOfWeek( GregorianCalendar gregCal, + private void setDayOfWeek( GregorianCalendar gregCal, XCellRange xcellrange, int intRow, int intColumn) { int intDayOfWeek = gregCal.get( Calendar.DAY_OF_WEEK ); @@ -703,7 +703,7 @@ public class ToDo { * @param xfunctionaccess Provides access to functions of the Calc. * @param intYear Year to calculate the official holidays. */ - public void getOfficialHolidays( + private void getOfficialHolidays( ArrayList<Object> vectorHolidays, XCellRange xcellrange, XFunctionAccess xfunctionaccess, @@ -795,7 +795,7 @@ public class ToDo { * @return The gregorian date before or after a specified number of * workdays. */ - public GregorianCalendar getWorkday( + private GregorianCalendar getWorkday( GregorianCalendar gregCalStartDate, int intDays, Object[][] objectHolidays, XFunctionAccess xfunctionaccess ) { @@ -839,7 +839,7 @@ public class ToDo { * @param xcellrange Providing the cells. * @param xfunctionaccess Provides the access to functions of the Calc. */ - public void getPrivateHolidays( ArrayList<Object> vectorHolidays, + private void getPrivateHolidays( ArrayList<Object> vectorHolidays, XCellRange xcellrange, XFunctionAccess xfunctionaccess ) { try { @@ -882,7 +882,7 @@ public class ToDo { /** Showing the stack trace in a JOptionPane. * @param sMessage The message to show. */ - public void showMessage( String sMessage ) { + private void showMessage( String sMessage ) { javax.swing.JFrame jframe = new javax.swing.JFrame(); jframe.setLocation(100, 100); jframe.setSize(300, 200); @@ -898,7 +898,7 @@ public class ToDo { * @param exception The occurred exception. * @see #showMessage(String) */ - public void showExceptionMessage( Exception exception ) { + private void showExceptionMessage( Exception exception ) { java.io.StringWriter swriter = new java.io.StringWriter(); java.io.PrintWriter printwriter = new java.io.PrintWriter( swriter ); diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 6c5a41931d96..74fad940051f 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -256,7 +256,7 @@ public class Assurance * @param _expectedExceptionClass is the class of the exception to be caught. If this is null, * it means that <em>no</em> exception must be throw by invoking the method. */ - protected void assureException( final String _message, final Object _object, final String _methodName, + private void assureException( final String _message, final Object _object, final String _methodName, final Class<?>[] _argClasses, final Object[] _methodArgs, final Class<?> _expectedExceptionClass ) { Class<?> objectClass = _object.getClass(); @@ -292,7 +292,7 @@ public class Assurance * @param _expectedExceptionClass is the class of the exception to be caught. If this is null, * it means that <em>no</em> exception must be throw by invoking the method. */ - protected void assureException( final String _message, final Object _object, final String _methodName, + private void assureException( final String _message, final Object _object, final String _methodName, final Object[] _methodArgs, final Class<?> _expectedExceptionClass ) { Class<?>[] argClasses = new Class[ _methodArgs.length ]; @@ -375,7 +375,7 @@ public class Assurance } } - protected void assureEquals( String message, Object expected, Object actual, boolean cont ) { + private void assureEquals( String message, Object expected, Object actual, boolean cont ) { assure( message + " (expected: " + expected.toString() + ", actual: " + actual.toString() + ")", expected.equals( actual ), cont ); } diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java index e1f75a22122e..26b61be9ec66 100644 --- a/qadevOOo/runner/convwatch/BorderRemover.java +++ b/qadevOOo/runner/convwatch/BorderRemover.java @@ -60,7 +60,7 @@ class BorderRemover * @param _nTolerance is a percentage value how strong the colors could be differ */ - boolean compareColorWithTolerance(int _nColor1, int _nColor2, int _nTolerance) + private boolean compareColorWithTolerance(int _nColor1, int _nColor2, int _nTolerance) { // int alpha1 = (_nColor1 >> 24) & 0xff; int red1 = (_nColor1 >> 16) & 0xff; @@ -179,7 +179,7 @@ class BorderRemover * as result it fills the m_nXMin, m_nXMax, m_nYMin, m_nYMax values. */ - Rect findBorder(ImageHelper _aImage, int _nBorderColor) + private Rect findBorder(ImageHelper _aImage, int _nBorderColor) { int h = _aImage.getHeight(); int w = _aImage.getWidth(); @@ -233,7 +233,7 @@ class BorderRemover return aRect; } - RenderedImage createImage(ImageHelper _aImage, Rect _aRect) throws IllegalArgumentException + private RenderedImage createImage(ImageHelper _aImage, Rect _aRect) throws IllegalArgumentException { // TODO: throw if w or h < 0 int w = _aRect.getWidth(); diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index 442a56f40195..d64de0543c12 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -30,7 +30,7 @@ import java.io.File; public class ConvWatch { - String getBuildID_FromFile(String _sInfoFile) + private String getBuildID_FromFile(String _sInfoFile) { String sBuildID = ""; IniFile aIniFile = new IniFile(_sInfoFile); @@ -57,7 +57,7 @@ public class ConvWatch * It's also absolutlly impossible to say, how much time this functions consume. */ - StatusHelper[] createPostscriptStartCheck(GraphicalTestArguments _aGTA, + private StatusHelper[] createPostscriptStartCheck(GraphicalTestArguments _aGTA, String _sOutputPath, String _sAbsoluteInputFile, String _sAbsoluteReferenceFile) throws ConvWatchCancelException { @@ -200,7 +200,7 @@ public class ConvWatch // This creates a status for exact on document - static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID) + private static boolean createINIStatus(StatusHelper[] aList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID, String _sRefBuildID) { System.getProperty("file.separator"); String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); @@ -265,7 +265,7 @@ public class ConvWatch - static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID) + private static void createINIStatus_DiffDiff(StatusHelper[] aDiffDiffList, String _sFilenamePrefix, String _sOutputPath, String _sAbsoluteInputFile, String _sBuildID) { System.getProperty("file.separator"); String sBasename = FileHelper.getBasename(_sAbsoluteInputFile); diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 30ec9b36d7d7..23f258e0bcbe 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -209,7 +209,7 @@ public class DB extends DBHelper System.out.println("UUID: " + sUUID); } - public ArrayList<String> QuerySQL(Connection _aCon, String _sSQL) + private ArrayList<String> QuerySQL(Connection _aCon, String _sSQL) { java.sql.Statement oStmt = null; ArrayList<String> aResultList = new ArrayList<String>(); diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java index f94e7274ce57..12b2651613b0 100644 --- a/qadevOOo/runner/convwatch/DBHelper.java +++ b/qadevOOo/runner/convwatch/DBHelper.java @@ -182,7 +182,7 @@ public class DBHelper return null; } - protected synchronized void ExecSQL(Connection _aCon, String _sSQL) + private synchronized void ExecSQL(Connection _aCon, String _sSQL) { MySQLThread aSQLThread = new MySQLThread(_aCon, _sSQL); aSQLThread.start(); diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java index 02a81d94d7df..ac0b94de12c7 100644 --- a/qadevOOo/runner/convwatch/DirectoryHelper.java +++ b/qadevOOo/runner/convwatch/DirectoryHelper.java @@ -30,7 +30,7 @@ public class DirectoryHelper private ArrayList<String> m_aFileList = new ArrayList<String>(); private boolean m_bRecursiveIsAllowed = true; - void setRecursiveIsAllowed(boolean _bValue) + private void setRecursiveIsAllowed(boolean _bValue) { m_bRecursiveIsAllowed = _bValue; } @@ -79,7 +79,7 @@ public class DirectoryHelper return a.m_aFileList.toArray(); } - void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) + private void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) { File fileDirectory = new File(afileDirectory); // Testing, if the file is a directory, and if so, it throws an exception diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java index a53a48b38e8e..9792d6f4ef70 100644 --- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java +++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java @@ -28,7 +28,7 @@ import convwatch.GraphicalTestArguments; public abstract class EnhancedComplexTestCase extends ComplexTestCase { - void checkExistance(String _sScriptFile, String _sName) + private void checkExistance(String _sScriptFile, String _sName) { // Process testshl = Runtime.getRuntime().exec(scriptFile); ProcessHandler aHandler = new ProcessHandler(_sScriptFile); @@ -71,7 +71,7 @@ public abstract class EnhancedComplexTestCase extends ComplexTestCase protected abstract Object[] mustInstalledSoftware(); - public boolean needCheckForInstalledSoftware() + private boolean needCheckForInstalledSoftware() { String sNEEDCHECK = (String)param.get( PropertyName.CHECK_NEED_TOOLS ); // TODO: I need to get the boolean value with get("name") because, if it is not given getBool() returns diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/runner/convwatch/FileHelper.java index 5ae392128204..221be5fa74be 100644 --- a/qadevOOo/runner/convwatch/FileHelper.java +++ b/qadevOOo/runner/convwatch/FileHelper.java @@ -168,7 +168,7 @@ public class FileHelper makeDirectories(first, path, "0777"); } - public static void makeDirectories(String first, String path, String _sMode) + private static void makeDirectories(String first, String path, String _sMode) { String fs = System.getProperty("file.separator"); if (path.startsWith(fs + fs)) // starts with UNC Path @@ -205,7 +205,7 @@ public class FileHelper // return; } - public static void chmod(File file, String mode) throws java.io.IOException + private static void chmod(File file, String mode) throws java.io.IOException { Runtime.getRuntime().exec (new String[] diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index c26e8ee99921..9d2919fcaf95 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -193,7 +193,7 @@ abstract class FilenameHelper_impl implements Filenamer /** * @return the complete name. Without convert the path separator! */ - String createAbsoluteFilename() + private String createAbsoluteFilename() { return m_sPath + fs + getFilename(); } @@ -201,7 +201,7 @@ abstract class FilenameHelper_impl implements Filenamer /* * remove follows 'file separators' */ - String checkPath(String _sPath) + private String checkPath(String _sPath) { String sPath; if (_sPath.endsWith("/") || _sPath.endsWith("\\")) @@ -215,7 +215,7 @@ abstract class FilenameHelper_impl implements Filenamer return sPath; } - String checkFilename(String _sFilename) + private String checkFilename(String _sFilename) { String sFilename; if (_sFilename.startsWith("/") || _sFilename.startsWith("\\")) @@ -229,7 +229,7 @@ abstract class FilenameHelper_impl implements Filenamer return sFilename; } - String checkSuffix(String _sSuffix) + private String checkSuffix(String _sSuffix) { String sSuffix; if (_sSuffix.startsWith(".")) @@ -243,7 +243,7 @@ abstract class FilenameHelper_impl implements Filenamer return sSuffix; } - String splitSuffix(String _sName) + private String splitSuffix(String _sName) { String sSuffix = FileHelper.getSuffix(_sName); return checkSuffix(sSuffix); diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 16062bd3629c..82083679afa3 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -310,7 +310,7 @@ public class GraphicalTestArguments return true; } - static void showInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + private static void showInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { @@ -366,8 +366,8 @@ public class GraphicalTestArguments } public void setTargetFrameName(String _sTargetFrameName) {m_sTargetFrameName = _sTargetFrameName;} public void setPrinterName(String _sName) {m_sPrinterName = _sName;} - public void setHidden() { m_bHidden = true;} - public void setViewable() {m_bHidden = false;} + private void setHidden() { m_bHidden = true;} + private void setViewable() {m_bHidden = false;} public void setDefaultXMLFormatApp(String _sNameOfApp) {m_sDefaultXMLFormatApplication = _sNameOfApp;} // get methods @@ -434,7 +434,7 @@ public class GraphicalTestArguments */ public int getResolutionInDPI() {return m_nResolutionInDPI;} - public static void checkIfMSWindowsConformPath(String _sPath) + private static void checkIfMSWindowsConformPath(String _sPath) { if (_sPath != null && _sPath.length() > 1) { diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/runner/convwatch/HTMLOutputter.java index 828d76bda74f..6425ec96816b 100644 --- a/qadevOOo/runner/convwatch/HTMLOutputter.java +++ b/qadevOOo/runner/convwatch/HTMLOutputter.java @@ -103,7 +103,7 @@ public class HTMLOutputter } } - String getHREF(String _sHREF, String _sPathInfo) + private String getHREF(String _sHREF, String _sPathInfo) { StringBuffer a = new StringBuffer(); if (! OSHelper.isWindows()) @@ -128,7 +128,7 @@ public class HTMLOutputter return a.toString(); } - String tableDataCell(String _sValue) + private String tableDataCell(String _sValue) { StringBuffer a = new StringBuffer(); a.append("<TD>"); @@ -137,7 +137,7 @@ public class HTMLOutputter return a.toString(); } - String tableHeaderCell(String _sValue) + private String tableHeaderCell(String _sValue) { StringBuffer a = new StringBuffer(); a.append("<TH>"); @@ -187,7 +187,7 @@ public class HTMLOutputter } - String stronghtml(String _sValue) + private String stronghtml(String _sValue) { StringBuffer a = new StringBuffer(); a.append("<STRONG>"); diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index 0851a9561302..dccef7351954 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -158,7 +158,7 @@ public class INIOutputter } } - void writeResult(boolean _bCurrentResult) throws java.io.IOException + private void writeResult(boolean _bCurrentResult) throws java.io.IOException { // is the check positiv, in a defined range if (_bCurrentResult) diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java index 404751328f01..1b3f46942dc5 100644 --- a/qadevOOo/runner/convwatch/IniFile.java +++ b/qadevOOo/runner/convwatch/IniFile.java @@ -47,7 +47,7 @@ class IniFile m_aList = loadLines(); } - ArrayList<String> loadLines() + private ArrayList<String> loadLines() { File aFile = new File(m_sFilename); ArrayList<String> aLines = new ArrayList<String>(); @@ -102,7 +102,7 @@ class IniFile - boolean isRemark(String _sLine) + private boolean isRemark(String _sLine) { if ( ((_sLine.length() < 2) ) || ( _sLine.startsWith("#")) || @@ -113,23 +113,23 @@ class IniFile return false; } - String getItem(int i) + private String getItem(int i) { return m_aList.get(i); } - String buildSectionName(String _sSectionName) + private String buildSectionName(String _sSectionName) { String sFindSection = "[" + _sSectionName + "]"; return sFindSection; } - String toLowerIfNeed(String _sName) + private String toLowerIfNeed(String _sName) { return _sName.toLowerCase(); } // return the number where this section starts - int findSection(String _sSection) + private int findSection(String _sSection) { String sFindSection = toLowerIfNeed(buildSectionName(_sSection)); // ----------- find _sSection --------------- @@ -155,7 +155,7 @@ class IniFile } // return the line number, where the key is found. - int findKey(String _sSection, String _sKey) + private int findKey(String _sSection, String _sKey) { int i = findSection(_sSection); if (i == -1) @@ -167,7 +167,7 @@ class IniFile } // i must be the index in the list, where the well known section starts - int findKeyFromKnownSection(int _nSectionIndex, String _sKey) + private int findKeyFromKnownSection(int _nSectionIndex, String _sKey) { _sKey = toLowerIfNeed(_sKey); for (int j=_nSectionIndex + 1; j<m_aList.size();j++) @@ -199,7 +199,7 @@ class IniFile } // i must be the index in the list, where the well known section starts - int findLastKnownKeyIndex(int _nSectionIndex, String _sKey) + private int findLastKnownKeyIndex(int _nSectionIndex, String _sKey) { _sKey = toLowerIfNeed(_sKey); int i = _nSectionIndex + 1; @@ -231,7 +231,7 @@ class IniFile return i; } - String getValue(int _nIndex) + private String getValue(int _nIndex) { String sLine = getItem(_nIndex).trim(); if (isRemark(sLine)) diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 4df3a2f23b10..90c0b93a3c52 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -47,7 +47,7 @@ public class MSOfficePrint public void setPrinterName(String _s) {m_sPrinterName = _s;} - static boolean isWordDocument(String _sSuffix) + private static boolean isWordDocument(String _sSuffix) { if (_sSuffix.toLowerCase().endsWith(".doc") || _sSuffix.toLowerCase().endsWith(".rtf") || @@ -58,7 +58,7 @@ public class MSOfficePrint return false; } - static boolean isExcelDocument(String _sSuffix) + private static boolean isExcelDocument(String _sSuffix) { // xlt templates // xlw @@ -75,7 +75,7 @@ public class MSOfficePrint return false; } - static boolean isPowerPointDocument(String _sSuffix) + private static boolean isPowerPointDocument(String _sSuffix) { if (_sSuffix.toLowerCase().endsWith(".pps") || _sSuffix.toLowerCase().endsWith(".ppt")) @@ -223,7 +223,7 @@ public class MSOfficePrint TimeHelper.waitInSeconds(2, "Give Microsoft Office some time to print."); } - public void realStartCommand(ArrayList<String> _aStartCommand) throws ConvWatchCancelException + private void realStartCommand(ArrayList<String> _aStartCommand) throws ConvWatchCancelException { if (_aStartCommand.isEmpty()) { @@ -269,7 +269,7 @@ public class MSOfficePrint } - ArrayList<String> createWordPrintHelper() throws java.io.IOException + private ArrayList<String> createWordPrintHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -374,7 +374,7 @@ public class MSOfficePrint // TODO: Maybe give a possibility to say where search the script from outside - ArrayList<String> searchLocalFile(String _sScriptName) + private ArrayList<String> searchLocalFile(String _sScriptName) { String userdir = System.getProperty("user.dir"); String fs = System.getProperty("file.separator"); @@ -401,7 +401,7 @@ public class MSOfficePrint return aList; } - ArrayList<String> createWordStoreHelper() throws java.io.IOException + private ArrayList<String> createWordStoreHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -483,7 +483,7 @@ public class MSOfficePrint } - ArrayList<String> createExcelPrintHelper() throws java.io.IOException + private ArrayList<String> createExcelPrintHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -578,7 +578,7 @@ public class MSOfficePrint return aList; } - ArrayList<String> createExcelStoreHelper() throws java.io.IOException + private ArrayList<String> createExcelStoreHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -668,7 +668,7 @@ public class MSOfficePrint return aList; } - ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException + private ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -771,7 +771,7 @@ public class MSOfficePrint @param _sFilename a name to a ms office xml file @return 'word' or 'excel' or '' if type not known */ - public String getOfficeType(String _sFilename) + private String getOfficeType(String _sFilename) { File aFile = new File(_sFilename); if (! aFile.exists()) diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/runner/convwatch/OfficePrint.java index 9efa7049068a..376d0a6edbe7 100644 --- a/qadevOOo/runner/convwatch/OfficePrint.java +++ b/qadevOOo/runner/convwatch/OfficePrint.java @@ -68,7 +68,7 @@ public class OfficePrint { /** * shows the FilterName and MediaType from the given XComponent */ - static String getDocumentType( XComponent _aDoc ) + private static String getDocumentType( XComponent _aDoc ) { XModel xModel = UnoRuntime.queryInterface( XModel.class, _aDoc); PropertyValue[] aArgs = xModel.getArgs(); @@ -85,7 +85,7 @@ public class OfficePrint { return ""; } - static void showDocumentType( XComponent _aDoc ) + private static void showDocumentType( XComponent _aDoc ) { String sNameValue = getDocumentType(_aDoc); GlobalLogWriter.get().println(" Property: '" + sNameValue); @@ -96,7 +96,7 @@ public class OfficePrint { * or we crash here. * Be aware, the ownership of the document gets to you, you have to close it. */ - public static XComponent loadFromURL(GraphicalTestArguments _aGTA, + private static XComponent loadFromURL(GraphicalTestArguments _aGTA, String _sInputURL) { XComponent aDoc = null; @@ -176,7 +176,7 @@ public class OfficePrint { return aDoc; } - static boolean exportToPDF(XComponent _xComponent, String _sDestinationName) + private static boolean exportToPDF(XComponent _xComponent, String _sDestinationName) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface( @@ -209,7 +209,7 @@ public class OfficePrint { return bWorked; } - static String getFilterName_forPDF(XServiceInfo xServiceInfo) + private static String getFilterName_forPDF(XServiceInfo xServiceInfo) { String filterName = ""; @@ -254,7 +254,7 @@ public class OfficePrint { - public static boolean storeAsPDF(GraphicalTestArguments _aGTA, + private static boolean storeAsPDF(GraphicalTestArguments _aGTA, String _sInputURL, String _sOutputURL) { @@ -274,7 +274,7 @@ public class OfficePrint { return bBack; } - public static boolean storeAsPDF(GraphicalTestArguments _aGTA, + private static boolean storeAsPDF(GraphicalTestArguments _aGTA, XComponent _aDoc, String _sOutputURL) { @@ -304,7 +304,7 @@ public class OfficePrint { * check existence of _sPrintFileURL */ - public static boolean printToFileWithOOo(GraphicalTestArguments _aGTA, + private static boolean printToFileWithOOo(GraphicalTestArguments _aGTA, String _sInputURL, String _sOutputURL, String _sPrintFileURL) @@ -335,7 +335,7 @@ public class OfficePrint { } - public static void createInfoFile(String _sFile, GraphicalTestArguments _aGTA) + private static void createInfoFile(String _sFile, GraphicalTestArguments _aGTA) { createInfoFile(_sFile, _aGTA, ""); } @@ -819,7 +819,7 @@ public class OfficePrint { - public static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + private static String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { @@ -892,7 +892,7 @@ public class OfficePrint { - static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + private static String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { @@ -965,7 +965,7 @@ public class OfficePrint { } - public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) + private static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) { if (_sInternalFilterName.length() == 0) { diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index ff676ea18fb3..4b3974840bfc 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -51,7 +51,7 @@ public class PRNCompare } - int getMaxNumOfFileEntry(String _sDirectory, String _sBasename) + private int getMaxNumOfFileEntry(String _sDirectory, String _sBasename) { // TODO: check if directory exist should be done earlier File aDirectory = new File(_sDirectory); @@ -117,10 +117,10 @@ public class PRNCompare public void setBorderMove(TriState _b) {m_tUseBorderMove = _b;} public TriState getBorderMove() {return m_tUseBorderMove;} public void setMaxPages(int _n) {m_nMaxPages = _n;} - int getMaxPages() {return m_nMaxPages;} + private int getMaxPages() {return m_nMaxPages;} public void setResolutionInDPI(int _n) {m_nResolutionInDPI = _n;} - int getResolutionInDPI() {return m_nResolutionInDPI;} + private int getResolutionInDPI() {return m_nResolutionInDPI;} public void setDocumentType(String _sTypeName) { @@ -157,7 +157,7 @@ public class PRNCompare return aList; } - static String getJPEGName(String _sOutputPath, String _sBasename, String _sGS_PageOutput) + private static String getJPEGName(String _sOutputPath, String _sBasename, String _sGS_PageOutput) { String fs = System.getProperty("file.separator"); @@ -233,7 +233,7 @@ public class PRNCompare * m_sReferenceFile * m_sOutputPath */ - public StatusHelper[] createDiffs(String _sOutputPath, String _sSourcePath1, String _sSourceFile1, String _sSourcePath2, String _sSourceFile2, int _nMaxDiffs, TriState _tUseBorderMove) + private StatusHelper[] createDiffs(String _sOutputPath, String _sSourcePath1, String _sSourceFile1, String _sSourcePath2, String _sSourceFile2, int _nMaxDiffs, TriState _tUseBorderMove) { if (_nMaxDiffs < 1) { @@ -342,7 +342,7 @@ public class PRNCompare } - public StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove) + private StatusHelper[] createDiffs(String[] _aRefList, String[] _aPSList, int _nMaxDiffs, TriState _tUseBorderMove) { if (_nMaxDiffs < 1) { @@ -466,7 +466,7 @@ public class PRNCompare return compareJPEGs(_sOldGfx, _sNewGfx, sDiffName); } - public static String compareJPEGs(String _sOldGfx, String _sNewGfx, String _sDiffGfx) + private static String compareJPEGs(String _sOldGfx, String _sNewGfx, String _sDiffGfx) { String sComposite = "composite"; if (OSHelper.isWindows()) @@ -502,7 +502,7 @@ public class PRNCompare * function checks how many different colors a picture contains. * if it's only one color (nResult==1), like background color, there is no difference. */ - int identify(String _sDiffGfx) + private int identify(String _sDiffGfx) { int nResult = 0; // would like to know what the meaning of %k is for ImageMagick's 'identify' @@ -614,7 +614,7 @@ public class PRNCompare * so the pixel count between old graphics and new graphics is twice the more. * */ - public int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx) + private int estimateGfx(String _sOldGfx, String _sNewGfx, String _sDiffGfx) throws java.io.IOException { // new count pixels diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/runner/convwatch/PerformanceContainer.java index 87612dc00531..31996739da9e 100644 --- a/qadevOOo/runner/convwatch/PerformanceContainer.java +++ b/qadevOOo/runner/convwatch/PerformanceContainer.java @@ -116,7 +116,7 @@ public class PerformanceContainer /* extends *//* implements */ { out.write("storeaspdftime=" + String.valueOf(m_nTime[ StoreAsPDF ]) + ls); } - public static double stringToDouble(String _sStr) + private static double stringToDouble(String _sStr) { double nValue = 0; try @@ -130,7 +130,7 @@ public class PerformanceContainer /* extends *//* implements */ { return nValue; } - public static long secondsToMilliSeconds(double _nSeconds) + private static long secondsToMilliSeconds(double _nSeconds) { return (long)(_nSeconds * 1000.0); } diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java index 6e41bca6232e..29c244d57465 100644 --- a/qadevOOo/runner/convwatch/PixelCounter.java +++ b/qadevOOo/runner/convwatch/PixelCounter.java @@ -93,7 +93,7 @@ class graphics_stuff return 0; } - public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter) + private static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter) { for (int y = 0; y < _h; y++) { for (int x = 0; x < _w; x++) { @@ -128,7 +128,7 @@ public class PixelCounter { private ImageHelper m_aImage; - public int countNotWhitePixel(String _sFile) + private int countNotWhitePixel(String _sFile) throws java.io.IOException { m_aImage = ImageHelper.createImageHelper(_sFile); @@ -136,7 +136,7 @@ public class PixelCounter { return nw; } - public int countNotBlackPixel(String _sFile) + private int countNotBlackPixel(String _sFile) throws java.io.IOException { m_aImage = ImageHelper.createImageHelper(_sFile); diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/runner/convwatch/ReferenceBuilder.java index c9fbc9a8dda6..8b8e31d063e6 100644 --- a/qadevOOo/runner/convwatch/ReferenceBuilder.java +++ b/qadevOOo/runner/convwatch/ReferenceBuilder.java @@ -79,7 +79,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase // The test method itself. private String m_sInputPath = ""; private String m_sReferencePath = ""; - void initMember() + private void initMember() { // MUST PARAMETER // INPUT_PATH ---------- @@ -192,7 +192,7 @@ public class ReferenceBuilder extends EnhancedComplexTestCase } } - void runGDC(String _sInputPath, String _sReferencePath) + private void runGDC(String _sInputPath, String _sReferencePath) { // first do a check if the reference not already exist, this is a big speedup, due to the fact, // we don't need to start a new office. diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java index 5c27afa4153f..c72e06c2b913 100644 --- a/qadevOOo/runner/convwatch/TriState.java +++ b/qadevOOo/runner/convwatch/TriState.java @@ -41,7 +41,7 @@ public class TriState Returns the value of this TriState object as an int * @return the primitive <code>int</code> value of this object. */ - public int intValue() + private int intValue() { return m_nValue; } diff --git a/qadevOOo/runner/graphical/DateHelper.java b/qadevOOo/runner/graphical/DateHelper.java index 1e12d16834a8..1d1ecd9c37f4 100644 --- a/qadevOOo/runner/graphical/DateHelper.java +++ b/qadevOOo/runner/graphical/DateHelper.java @@ -35,7 +35,7 @@ public class DateHelper return getDateString("[yyyy/MM/dd HH:mm:ss]"); } - public static String getDateString(String _sFormat) + private static String getDateString(String _sFormat) { GregorianCalendar aCalendar = new GregorianCalendar(); StringBuffer aBuf = new StringBuffer(); diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java index ca36ef8b0839..a52add895a0b 100644 --- a/qadevOOo/runner/graphical/DirectoryHelper.java +++ b/qadevOOo/runner/graphical/DirectoryHelper.java @@ -30,7 +30,7 @@ public class DirectoryHelper private ArrayList<String> m_aFileList = new ArrayList<String>(); private boolean m_bRecursiveIsAllowed = true; - void setRecursiveIsAllowed(boolean _bValue) + private void setRecursiveIsAllowed(boolean _bValue) { m_bRecursiveIsAllowed = _bValue; } @@ -80,7 +80,7 @@ public class DirectoryHelper return a.m_aFileList.toArray(); } - void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) + private void traverse_impl( String afileDirectory, FileFilter _aFileFilter ) { File fileDirectory = new File(afileDirectory); // Testing, if the file is a directory, and if so, it throws an exception diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/runner/graphical/FileHelper.java index aa565f98efa5..bee04eb64622 100644 --- a/qadevOOo/runner/graphical/FileHelper.java +++ b/qadevOOo/runner/graphical/FileHelper.java @@ -163,7 +163,7 @@ public class FileHelper makeDirectories(first, path, "0777"); } - public static void makeDirectories(String first, String path, String _sMode) + private static void makeDirectories(String first, String path, String _sMode) { String fs = System.getProperty("file.separator"); if (path.startsWith(fs + fs)) // starts with UNC Path @@ -200,7 +200,7 @@ public class FileHelper // return; } - public static void chmod(File file, String mode) throws java.io.IOException + private static void chmod(File file, String mode) throws java.io.IOException { Runtime.getRuntime().exec (new String[] @@ -597,7 +597,7 @@ public class FileHelper } - public static void addBasenameToFile(String _sIndexFilename, String _sBasename, String _sCreator, String _sType, String _sSource) + private static void addBasenameToFile(String _sIndexFilename, String _sBasename, String _sCreator, String _sType, String _sSource) { String sPath; if (_sIndexFilename.startsWith("file:")) diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java index 30b38c3b15e8..b2508b173c38 100644 --- a/qadevOOo/runner/graphical/IniFile.java +++ b/qadevOOo/runner/graphical/IniFile.java @@ -357,7 +357,7 @@ public class IniFile implements Enumeration<String> */ // TODO: make private - public void store() + private void store() { if (m_bListContainUnsavedChanges == false) { diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java index dccc588da516..6d9c5c698d37 100644 --- a/qadevOOo/runner/graphical/JPEGCreator.java +++ b/qadevOOo/runner/graphical/JPEGCreator.java @@ -91,7 +91,7 @@ public class JPEGCreator extends EnhancedComplexTestCase * Create a lot of smaller and nicer Pictures of the big fat pages. * Looks better */ - public void createSmallPictures(String _sJPEGSchema) + private void createSmallPictures(String _sJPEGSchema) { ParameterHelper aParam = new ParameterHelper(param); if (! aParam.createSmallPictures()) @@ -193,7 +193,7 @@ private static void convertToWidth340(String _sFrom, String _To) * @param _aParam * @return the schema of the first jpeg name */ - String createJPEG(String _sFile, String _sAdditional, ParameterHelper _aParam) + private String createJPEG(String _sFile, String _sAdditional, ParameterHelper _aParam) { if (_sFile.startsWith("file:///")) { @@ -342,7 +342,7 @@ private static void convertToWidth340(String _sFrom, String _To) * with leading '0' (zero) * @return number of really existing pages of a given JPEG schema */ - public int countPages(String _sJPEGSchema) + private int countPages(String _sJPEGSchema) { int nPages = 0; if (_sJPEGSchema.length() > 0) diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index 52a62c659da6..2132297f893d 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -218,7 +218,7 @@ public class MSOfficePostscriptCreator implements IOffice /** * print the given file (_sInputFile) to the file name (_sPrintFile) */ - public void printToFileWithMSOffice( ParameterHelper _aGTA, + private void printToFileWithMSOffice( ParameterHelper _aGTA, String _sInputFile, String _sPrintFilename) throws OfficeException, java.io.IOException { @@ -285,7 +285,7 @@ public class MSOfficePostscriptCreator implements IOffice TimeHelper.waitInSeconds(2, "Give Microsoft Office some time to print."); } - public void realStartCommand(ArrayList<String> _aStartCommand) throws OfficeException + private void realStartCommand(ArrayList<String> _aStartCommand) throws OfficeException { if (_aStartCommand.isEmpty()) { @@ -335,7 +335,7 @@ public class MSOfficePostscriptCreator implements IOffice return sPerlExe; } - ArrayList<String> createWordPrintHelper() throws java.io.IOException + private ArrayList<String> createWordPrintHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -439,7 +439,7 @@ public class MSOfficePostscriptCreator implements IOffice // TODO: Maybe give a possibility to say where search the script from outside - ArrayList<String> searchLocalFile(String _sScriptName) + private ArrayList<String> searchLocalFile(String _sScriptName) { String userdir = System.getProperty("user.dir"); @@ -466,7 +466,7 @@ public class MSOfficePostscriptCreator implements IOffice return aList; } - ArrayList<String> createWordStoreHelper() throws java.io.IOException + private ArrayList<String> createWordStoreHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -548,7 +548,7 @@ public class MSOfficePostscriptCreator implements IOffice } - ArrayList<String> createExcelPrintHelper() throws java.io.IOException + private ArrayList<String> createExcelPrintHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -651,7 +651,7 @@ public class MSOfficePostscriptCreator implements IOffice return aList; } - ArrayList<String> createExcelStoreHelper() throws java.io.IOException + private ArrayList<String> createExcelStoreHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -740,7 +740,7 @@ public class MSOfficePostscriptCreator implements IOffice return aList; } - ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException + private ArrayList<String> createPowerPointPrintHelper() throws java.io.IOException { // create a program in tmp file String sTmpPath = util.utils.getUsersTempDir(); @@ -845,7 +845,7 @@ public class MSOfficePostscriptCreator implements IOffice @param _sFilename a name to a ms office xml file @return 'word' or 'excel' or '' if type not known */ - public String getOfficeType(String _sFilename) + private String getOfficeType(String _sFilename) { File aFile = new File(_sFilename); if (! aFile.exists()) diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java index f6d1d3fcf922..4408b527a1f6 100644 --- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java @@ -345,7 +345,7 @@ public class OpenOfficePostscriptCreator implements IOffice - public boolean storeAsPDF(ParameterHelper _aGTA, + private boolean storeAsPDF(ParameterHelper _aGTA, XComponent _aDoc, String _sOutputURL) throws OfficeException { @@ -647,7 +647,7 @@ public class OpenOfficePostscriptCreator implements IOffice - public String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + private String getInternalFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { @@ -720,7 +720,7 @@ public class OpenOfficePostscriptCreator implements IOffice - String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) + private String getServiceNameFromFilterName(String _sFilterName, XMultiServiceFactory _xMSF) { if (_sFilterName.length() == 0) { @@ -792,7 +792,7 @@ public class OpenOfficePostscriptCreator implements IOffice } - public static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) + private static String getFileExtension(String _sInternalFilterName, XMultiServiceFactory _xMSF) { if (_sInternalFilterName.length() == 0) { diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/runner/graphical/PerformanceContainer.java index 32eaac791cf0..9291d01b5c00 100644 --- a/qadevOOo/runner/graphical/PerformanceContainer.java +++ b/qadevOOo/runner/graphical/PerformanceContainer.java @@ -130,7 +130,7 @@ public class PerformanceContainer /* extends *//* implements */ { _aIniFile.insertValue(_sSection, "alltime" , String.valueOf(m_nTime[ AllTime ])); } - public static double stringToDouble(String _sStr) + private static double stringToDouble(String _sStr) { double nValue = 0; try @@ -144,7 +144,7 @@ public class PerformanceContainer /* extends *//* implements */ { return nValue; } - public static long secondsToMilliSeconds(double _nSeconds) + private static long secondsToMilliSeconds(double _nSeconds) { return (long)(_nSeconds * 1000.0); } diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/runner/graphical/PixelCounter.java index 887424772d65..0807b26cbdeb 100644 --- a/qadevOOo/runner/graphical/PixelCounter.java +++ b/qadevOOo/runner/graphical/PixelCounter.java @@ -120,7 +120,7 @@ class CountNotBlack extends CountPixel class graphics_stuff { - public static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter) + private static void countPixel(ImageHelper img, int _w, int _h, CountPixel _aPixelCounter) { for (int y = 0; y < _h; y++) { for (int x = 0; x < _w; x++) { @@ -153,7 +153,7 @@ class graphics_stuff public class PixelCounter { - public int countNotWhitePixel(String _sFile) + private int countNotWhitePixel(String _sFile) throws java.io.IOException { ImageHelper aImage = ImageHelper.createImageHelper(_sFile); @@ -161,7 +161,7 @@ public class PixelCounter { return nw; } - public int countNotBlackPixel(String _sFile) + private int countNotBlackPixel(String _sFile) throws java.io.IOException { ImageHelper aImage = ImageHelper.createImageHelper(_sFile); diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java index 86a501b05cfc..6c94706dc5c4 100644 --- a/qadevOOo/runner/helper/APIDescGetter.java +++ b/qadevOOo/runner/helper/APIDescGetter.java @@ -260,7 +260,7 @@ public class APIDescGetter extends DescGetter return entry; } - protected static DescEntry[] getSubEntries(BufferedReader cvsFile, + private static DescEntry[] getSubEntries(BufferedReader cvsFile, DescEntry parent) { String line = ""; @@ -463,7 +463,7 @@ public class APIDescGetter extends DescGetter /** * This method ensures that XComponent will be the last in the list of interfaces */ - protected static Object[] makeArray(ArrayList<DescEntry> entries) + private static Object[] makeArray(ArrayList<DescEntry> entries) { Object[] entriesArray = entries.toArray(); ArrayList<Object> returnArray = new ArrayList<Object>(); @@ -491,7 +491,7 @@ public class APIDescGetter extends DescGetter return returnArray.toArray(); } - protected static DescEntry setErrorDescription(DescEntry entry, + private static DescEntry setErrorDescription(DescEntry entry, String ErrorMsg) { if (entry == null) @@ -505,7 +505,7 @@ public class APIDescGetter extends DescGetter return entry; } - protected static DescEntry[] getDescArray(Object[] list) + private static DescEntry[] getDescArray(Object[] list) { DescEntry[] entries = new DescEntry[list.length]; @@ -517,7 +517,7 @@ public class APIDescGetter extends DescGetter return entries; } - protected DescEntry getFromClassPath(String aEntry) + private DescEntry getFromClassPath(String aEntry) { int dotindex = aEntry.indexOf('.'); @@ -631,7 +631,7 @@ public class APIDescGetter extends DescGetter return theEntry; } - protected static DescEntry getFromDirectory(String descPath, String entry, + private static DescEntry getFromDirectory(String descPath, String entry, boolean debug) { int dotindex = entry.indexOf('.'); @@ -737,7 +737,7 @@ public class APIDescGetter extends DescGetter return namesList; } - protected ArrayList<String> getSubObjects(String job) + private ArrayList<String> getSubObjects(String job) { ArrayList<String> namesList = new ArrayList<String>(); StringTokenizer st = new StringTokenizer(job, ","); @@ -778,7 +778,7 @@ public class APIDescGetter extends DescGetter return scenario; } - protected String[] getScenarioFromDirectory(String descPath, String job) + private String[] getScenarioFromDirectory(String descPath, String job) { String[] modules = null; ArrayList<String> componentList = new ArrayList<String>(); @@ -832,7 +832,7 @@ public class APIDescGetter extends DescGetter } - protected String[] getScenarioFromClassPath(String job) + private String[] getScenarioFromClassPath(String job) { String subdir = "/"; @@ -903,7 +903,7 @@ public class APIDescGetter extends DescGetter return scenario; } - protected String getComponentForString(String full, String module) + private String getComponentForString(String full, String module) { String component = ""; @@ -927,7 +927,7 @@ public class APIDescGetter extends DescGetter return component; } - protected boolean isUnusedModule(String moduleName) + private boolean isUnusedModule(String moduleName) { ArrayList<String> removed = new ArrayList<String>(); removed.add("acceptor"); diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/runner/helper/CfgParser.java index bda0cf09d9b3..3ab2b6a28b52 100644 --- a/qadevOOo/runner/helper/CfgParser.java +++ b/qadevOOo/runner/helper/CfgParser.java @@ -120,7 +120,7 @@ public class CfgParser } } - protected Properties getProperties(String name) + private Properties getProperties(String name) { // get the resource file Properties prop = new Properties(); @@ -158,7 +158,7 @@ public class CfgParser return prop; } - protected String getDefaultFileName(boolean home) + private String getDefaultFileName(boolean home) { String fileSeparator = System.getProperty("file.separator"); String path = ""; diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java index fbe102ebffa8..8e4c0ab47bf0 100644 --- a/qadevOOo/runner/helper/ClParser.java +++ b/qadevOOo/runner/helper/ClParser.java @@ -148,7 +148,7 @@ public class ClParser /* * This method maps commandline Parameters to TestParameters */ - protected Properties getMapping() + private Properties getMapping() { Properties map = new Properties(); map.setProperty("-cs", "ConnectionString"); @@ -169,7 +169,7 @@ public class ClParser return map; } - protected String getParameterFor(Properties map, String name) + private String getParameterFor(Properties map, String name) { String ret = map.getProperty(name); diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java index d2af126d0eab..3d62291baa00 100644 --- a/qadevOOo/runner/helper/ConfigHelper.java +++ b/qadevOOo/runner/helper/ConfigHelper.java @@ -125,7 +125,7 @@ public class ConfigHelper } - public Object readRelativeKey(String sRelPath, + private Object readRelativeKey(String sRelPath, String sKey ) throws com.sun.star.container.NoSuchElementException { @@ -143,7 +143,7 @@ public class ConfigHelper } - public void writeRelativeKey(String sRelPath, + private void writeRelativeKey(String sRelPath, String sKey , Object aValue ) throws com.sun.star.container.NoSuchElementException @@ -344,7 +344,7 @@ public class ConfigHelper * @throws com.sun.star.uno.Exception on any error * @return A XNameContainer of the Set */ - public XNameContainer getSet(String setName) + private XNameContainer getSet(String setName) throws com.sun.star.uno.Exception { XNameReplace xCont = UnoRuntime.queryInterface(XNameReplace.class, m_xConfig); diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index c12d2519e852..2d1d01497046 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -54,7 +54,7 @@ public class OfficeProvider implements AppProvider /** * copy the user layer to a safe place, usually to $TMP/user_backup$USER */ - public void backupUserLayer(TestParameters param, XMultiServiceFactory msf) + private void backupUserLayer(TestParameters param, XMultiServiceFactory msf) { try { @@ -316,7 +316,7 @@ public class OfficeProvider implements AppProvider * @throws com.sun.star.connection.NoConnectException * @throws Exception */ - protected static XMultiServiceFactory connect(String connectStr) + private static XMultiServiceFactory connect(String connectStr) throws com.sun.star.uno.Exception, com.sun.star.uno.RuntimeException, com.sun.star.connection.NoConnectException, @@ -579,7 +579,7 @@ public class OfficeProvider implements AppProvider return result; } - protected boolean closeAllWindows(XDesktop desk) + private boolean closeAllWindows(XDesktop desk) { final XEnumerationAccess compEnumAccess = desk.getComponents(); final XEnumeration compEnum = compEnumAccess.createEnumeration(); @@ -613,7 +613,7 @@ public class OfficeProvider implements AppProvider return res; } - public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) + private static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) { Object xPathSubst = null; @@ -641,7 +641,7 @@ public class OfficeProvider implements AppProvider * converts directory without 'file:///' prefix. * and System dependent file separator */ - public static String getDirSys(String dir) + private static String getDirSys(String dir) { String sysDir = ""; diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java index e001ca335ab2..2e48887c5d9f 100644 --- a/qadevOOo/runner/helper/OfficeWatcher.java +++ b/qadevOOo/runner/helper/OfficeWatcher.java @@ -99,14 +99,14 @@ public class OfficeWatcher extends Thread implements share.Watcher { dbg("finished"); } - protected void shortWait(int timeOut) { + private void shortWait(int timeOut) { try { OfficeWatcher.sleep(timeOut); } catch (java.lang.InterruptedException ie) { } } - protected void dbg(String message) { + private void dbg(String message) { if (debug) { System.out.println(utils.getDateTime() + "OfficeWatcher: " + message); } diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 042f0d6132ed..43372d224b67 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -480,7 +480,7 @@ public class ProcessHandler /** * Returns the time in seconds since 1st January 1970 */ - public static long getSystemTime() + private static long getSystemTime() { final long nTime = System.currentTimeMillis(); return nTime; @@ -512,7 +512,7 @@ public class ProcessHandler } } - protected void execute() + private void execute() { if (isStarted()) { @@ -607,7 +607,7 @@ public class ProcessHandler * @return <code>true</code> if process correctly exited * (exit code doesn't affect to this result). */ - public boolean waitFor(long timeout) + private boolean waitFor(long timeout) { return waitFor(timeout, true); } @@ -690,7 +690,7 @@ public class ProcessHandler return isFinished(); } - protected void flushInput() + private void flushInput() { if (stdIn == null) { @@ -797,7 +797,7 @@ public class ProcessHandler /** Causes the thread to sleep some time. */ - public static void shortWait(long milliseconds) + private static void shortWait(long milliseconds) { try { @@ -849,7 +849,7 @@ public class ProcessHandler * * Reason: interrupt() seems not to work as expected. */ - public synchronized void holdOn() + private synchronized void holdOn() { m_bInterrupt = true; interrupt(); diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/runner/helper/StringHelper.java index 7d985cc03be1..3ed630030e76 100644 --- a/qadevOOo/runner/helper/StringHelper.java +++ b/qadevOOo/runner/helper/StringHelper.java @@ -21,12 +21,12 @@ package helper; public class StringHelper { - public static String doubleQuote(String _sStr) + private static String doubleQuote(String _sStr) { return "\"" + _sStr + "\""; } - public static String singleQuote(String _sStr) + private static String singleQuote(String _sStr) { return "'" + _sStr + "'"; } diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java index 9cd18fb9d3f5..c869f1a1d48b 100644 --- a/qadevOOo/runner/helper/URLHelper.java +++ b/qadevOOo/runner/helper/URLHelper.java @@ -123,7 +123,7 @@ public class URLHelper * an url which represent the given system path * and uses the given protocol */ - public static String getURLWithProtocolFromSystemPath( File aSystemPath, File aBasePath, String sServerURL ) + private static String getURLWithProtocolFromSystemPath( File aSystemPath, File aBasePath, String sServerURL ) { String sFileURL = URLHelper.getFileURLFromSystemPath(aSystemPath); String sBaseURL = URLHelper.getFileURLFromSystemPath(aBasePath ); diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 900646fcb807..9ee716eeefd0 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -144,7 +144,7 @@ public class Parameters implements XPropertySet { }; } - public Map<String,Object> toMap() { + private Map<String,Object> toMap() { return new HashMap<String,Object>(parameters) { public String get(String obj) { return Parameters.this.get(obj); diff --git a/qadevOOo/runner/org/openoffice/Runner.java b/qadevOOo/runner/org/openoffice/Runner.java index 6aecdf59d11d..5513c0bb17cf 100644 --- a/qadevOOo/runner/org/openoffice/Runner.java +++ b/qadevOOo/runner/org/openoffice/Runner.java @@ -39,7 +39,7 @@ public class Runner private static long m_nStartTime; - public static long getRunnerStartTime() + private static long getRunnerStartTime() { return m_nStartTime; } @@ -60,7 +60,7 @@ public class Runner /* return the time, which is done until last startTime() */ - public static long meanTime(long _nCurrentTimer) + private static long meanTime(long _nCurrentTimer) { if (_nCurrentTimer == 0) { diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java index b36dcfc07c98..6ffe9b705c39 100644 --- a/qadevOOo/runner/stats/DataBaseOutProducer.java +++ b/qadevOOo/runner/stats/DataBaseOutProducer.java @@ -87,7 +87,7 @@ public abstract class DataBaseOutProducer implements LogWriter { * @param entry The description entry that is take as root * @param log The log writer */ - protected boolean findTypeInEntryTree(DescEntry entry, LogWriter log) { + private boolean findTypeInEntryTree(DescEntry entry, LogWriter log) { boolean returnVal = true; if (isWriteableEntryType(entry)) { returnVal &= insertEntry(entry, log); @@ -108,7 +108,7 @@ public abstract class DataBaseOutProducer implements LogWriter { * @param entry The entry to write. * @param log The log writer. */ - protected boolean insertEntry(DescEntry entry, LogWriter log) { + private boolean insertEntry(DescEntry entry, LogWriter log) { // copy the swlInput HashMap, so it can be reset easily for the next run HashMap<String,Object> copySqlInput = new HashMap<String,Object>(); copySqlInput.putAll(mSqlInput); @@ -138,7 +138,7 @@ public abstract class DataBaseOutProducer implements LogWriter { * @param entry The entry that is checked * @return True, if it is indeed a writeable entry. */ - protected boolean isWriteableEntryType(DescEntry entry) { + private boolean isWriteableEntryType(DescEntry entry) { boolean result = false; for (int i=0; i<mWriteableEntryTypes.length; i++) { if (entry.EntryType.equals(mWriteableEntryTypes[i])) { diff --git a/qadevOOo/runner/stats/OutProducerFactory.java b/qadevOOo/runner/stats/OutProducerFactory.java index c900cf484e40..a657a116f3d5 100644 --- a/qadevOOo/runner/stats/OutProducerFactory.java +++ b/qadevOOo/runner/stats/OutProducerFactory.java @@ -65,7 +65,7 @@ public class OutProducerFactory { * @param param The test parameters * @return The database out producer, or null if it couldn't be created. */ - public static LogWriter createDataBaseOutProducer(HashMap<String,Object> param) { + private static LogWriter createDataBaseOutProducer(HashMap<String,Object> param) { String dataProducerName = (String)param.get("DataBaseOutProducer"); if (dataProducerName == null) { String testBaseName = (String)param.get("TestBase"); @@ -89,7 +89,7 @@ public class OutProducerFactory { * As a fallback, create a simple out producer, if all else failed. * @return A simple out producer, writing to the screen. */ - public static LogWriter createSimpleOutProducer() { + private static LogWriter createSimpleOutProducer() { return new SimpleOutProducer(); } diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index 3e4553755fa1..6b893106c65b 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -104,7 +104,7 @@ public class AccessibilityTools { } } - public static XAccessibleContext getAccessibleObjectForRoleIgnoreShowing_(XAccessible xacc, + private static XAccessibleContext getAccessibleObjectForRoleIgnoreShowing_(XAccessible xacc, short role) { XAccessibleContext ac = xacc.getAccessibleContext(); if (ac == null) { @@ -136,7 +136,7 @@ public class AccessibilityTools { } } - public static XAccessibleContext getAccessibleObjectForRole_(XAccessible xacc, + private static XAccessibleContext getAccessibleObjectForRole_(XAccessible xacc, short role) { XAccessibleContext ac = xacc.getAccessibleContext(); boolean isShowing = ac.getAccessibleStateSet() @@ -318,7 +318,7 @@ public class AccessibilityTools { printAccessibleTree(log, xacc, ""); } - protected static void printAccessibleTree(PrintWriter log, + private static void printAccessibleTree(PrintWriter log, XAccessible xacc, String indent) { XAccessibleContext ac = xacc.getAccessibleContext(); diff --git a/qadevOOo/runner/util/CalcTools.java b/qadevOOo/runner/util/CalcTools.java index 3cc885e1107e..dd6defab8050 100644 --- a/qadevOOo/runner/util/CalcTools.java +++ b/qadevOOo/runner/util/CalcTools.java @@ -113,7 +113,7 @@ public class CalcTools { * @return calc sheet * @see com.sun.star.sheet.XSpreadsheet */ - public static XSpreadsheet getSpreadSheetFromSheetDoc(XComponent xSheetDoc, int sheetNumber) + private static XSpreadsheet getSpreadSheetFromSheetDoc(XComponent xSheetDoc, int sheetNumber) throws java.lang.Exception { XSpreadsheet xSheet = null; diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index e0bf47016e6e..5f22f5407dd2 100644 --- a/qadevOOo/runner/util/DBTools.java +++ b/qadevOOo/runner/util/DBTools.java @@ -191,7 +191,7 @@ public class DBTools { * Prints datasource info. * @param out Stream to which information is printed. */ - public void printInfo(PrintWriter out) { + private void printInfo(PrintWriter out) { out.println("Name = '" + Name + "'") ; out.println(" URL = '" + URL + "'") ; out.print(" Info = ") ; @@ -294,7 +294,7 @@ public class DBTools { * @param dataSource <code>DataSource</code> object which is to * be registered. */ - public void registerDB(String name, Object dataSource) + private void registerDB(String name, Object dataSource) throws com.sun.star.uno.Exception { dbContext.registerObject(name, dataSource) ; @@ -424,7 +424,7 @@ public class DBTools { * @return <code>com.sun.star.sdb.DataSource</code> service * implementation which represents TestDB. */ - public Object registerTestDB(String docPath) + private Object registerTestDB(String docPath) throws com.sun.star.uno.Exception { String testURL = null ; @@ -490,7 +490,7 @@ public class DBTools { // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // Currently doesn't work because of bugs 85509, 85510 - public int deleteAllRows(XConnection con, String table) + private int deleteAllRows(XConnection con, String table) throws com.sun.star.sdbc.SQLException { XStatement stat = con.createStatement() ; @@ -535,7 +535,7 @@ public class DBTools { * </code> types specified. In this case the parameter specifies * the length of the stream for inserting. */ - public void addRowToTestTable(XConnection con, String table, Object[] values, + private void addRowToTestTable(XConnection con, String table, Object[] values, int streamLength) throws com.sun.star.sdbc.SQLException { @@ -698,7 +698,7 @@ public class DBTools { * statement and obtaining the results produced by it. * @param tbl_name Test table name. */ - protected void insertContentMySQLTable(Statement statement, String tbl_name) + private void insertContentMySQLTable(Statement statement, String tbl_name) throws java.sql.SQLException { @@ -746,7 +746,7 @@ public class DBTools { * statement and obtaining the results produced by it. * @param tbl_name Test table name. */ - protected void createMySQLTable(Statement statement, String tbl_name) + private void createMySQLTable(Statement statement, String tbl_name) throws java.sql.SQLException { final String empty_col_name = "Column"; @@ -794,7 +794,7 @@ public class DBTools { * statement and obtaining the results produced by it. * @param tbl_name Test table name. */ - protected void dropMySQLTable(Statement statement, String tbl_name) + private void dropMySQLTable(Statement statement, String tbl_name) throws java.sql.SQLException { statement.executeUpdate("drop table if exists " + tbl_name); } diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index f790ad93924a..30bfd8725d43 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -56,7 +56,7 @@ public class DesktopTools * @param xMSF the MultiServiceFactory * @return the gained XComponentLoader */ - public static XComponentLoader getCLoader(XMultiServiceFactory xMSF) + private static XComponentLoader getCLoader(XMultiServiceFactory xMSF) { XDesktop oDesktop = UnoRuntime.queryInterface( XDesktop.class, createDesktop(xMSF)); @@ -178,7 +178,7 @@ public class DesktopTools * </ul> * or <CODE>null</CODE> */ - public static String getDocumentType(XComponent xComponent) + private static String getDocumentType(XComponent xComponent) { XServiceInfo sInfo = UnoRuntime.queryInterface( XServiceInfo.class, xComponent); diff --git a/qadevOOo/runner/util/DrawTools.java b/qadevOOo/runner/util/DrawTools.java index 05c5551c117d..acb89d88e26c 100644 --- a/qadevOOo/runner/util/DrawTools.java +++ b/qadevOOo/runner/util/DrawTools.java @@ -119,7 +119,7 @@ public class DrawTools { * @return the created XShape */ - public XShape createShape( XComponent oDoc, int height, int width, int x, + private XShape createShape( XComponent oDoc, int height, int width, int x, int y, String kind ) { //possible values for kind are 'Ellipse', 'Line' and 'Rectangle' diff --git a/qadevOOo/runner/util/DynamicClassLoader.java b/qadevOOo/runner/util/DynamicClassLoader.java index dbb3dd7972c2..ff70becefbba 100644 --- a/qadevOOo/runner/util/DynamicClassLoader.java +++ b/qadevOOo/runner/util/DynamicClassLoader.java @@ -31,7 +31,7 @@ public class DynamicClassLoader { * @param className The name of the class to create. * @return The created class. */ - public static Class<?> forName(String className) + private static Class<?> forName(String className) throws ClassNotFoundException { return Class.forName(className) ; diff --git a/qadevOOo/runner/util/FormTools.java b/qadevOOo/runner/util/FormTools.java index 9b6a3ae6db6d..9064487f791c 100644 --- a/qadevOOo/runner/util/FormTools.java +++ b/qadevOOo/runner/util/FormTools.java @@ -184,7 +184,7 @@ public class FormTools { return oFS.getForms(); } //finish getForms - public static XIndexContainer getIndexedForms ( XDrawPage oDP ) + private static XIndexContainer getIndexedForms ( XDrawPage oDP ) { XFormsSupplier oFS = UnoRuntime.queryInterface( XFormsSupplier.class,oDP); diff --git a/qadevOOo/runner/util/RegistryTools.java b/qadevOOo/runner/util/RegistryTools.java index 686411495feb..ff33c8c1442e 100644 --- a/qadevOOo/runner/util/RegistryTools.java +++ b/qadevOOo/runner/util/RegistryTools.java @@ -71,7 +71,7 @@ public class RegistryTools { * return <code>true</code> if key names, value types * and values are equal, else returns <code>false</code>. */ - public static boolean compareKeys + private static boolean compareKeys (XRegistryKey key1, XRegistryKey key2) { if (key1 == null || key2 == null || @@ -152,7 +152,7 @@ public class RegistryTools { * @param keyName Full key name. * @return Short key name. */ - public static String getShortKeyName(String keyName) { + private static String getShortKeyName(String keyName) { if (keyName == null) return null ; int idx = keyName.lastIndexOf("/") ; if (idx < 0) return keyName ; @@ -166,7 +166,7 @@ public class RegistryTools { * comparing from children of root keys. * @return <code>true</code> if keys and their sub keys are equal. */ - protected static boolean compareKeyTrees + private static boolean compareKeyTrees (XRegistryKey tree1, XRegistryKey tree2, boolean compareRoot) { if (compareRoot && !compareKeys(tree1, tree2)) return false ; diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index f6db1c696bcd..8a841397ee5c 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -590,7 +590,7 @@ public class SOfficeFactory { } // finished openDoc - public XComponent openDoc(String kind, String frameName, PropertyValue[] mediaDescriptor) + private XComponent openDoc(String kind, String frameName, PropertyValue[] mediaDescriptor) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.io.IOException, com.sun.star.uno.Exception { diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index 0df280360c83..c97c6d47c008 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -457,7 +457,7 @@ public class UITools { * @throws java.lang.Exception if something fail * @return the value of the named numeric filed */ - public String getNumericFieldValue(String NumericFieldName) + private String getNumericFieldValue(String NumericFieldName) throws java.lang.Exception { try{ diff --git a/qadevOOo/runner/util/ValueComparer.java b/qadevOOo/runner/util/ValueComparer.java index e9f9fa9d1473..dfc0768c5322 100644 --- a/qadevOOo/runner/util/ValueComparer.java +++ b/qadevOOo/runner/util/ValueComparer.java @@ -69,7 +69,7 @@ public class ValueComparer { return eq; } // end of equalValue - static boolean compareArrayOfPropertyValue(PropertyValue[] pv1, PropertyValue[] pv2){ + private static boolean compareArrayOfPropertyValue(PropertyValue[] pv1, PropertyValue[] pv2){ if ( pv1.length != pv2.length) { return false; } @@ -89,7 +89,7 @@ public class ValueComparer { return result; } - static boolean compareArrays(Object op1, Object op2) throws Exception { + private static boolean compareArrays(Object op1, Object op2) throws Exception { if (op1 instanceof PropertyValue[] && op2 instanceof PropertyValue[]) { return compareArrayOfPropertyValue((PropertyValue[])op1,(PropertyValue[])op2); @@ -109,11 +109,11 @@ public class ValueComparer { return result; } - static boolean compareInterfaces(XInterface op1, XInterface op2) { + private static boolean compareInterfaces(XInterface op1, XInterface op2) { return op1 == op2; } - static boolean compareUntil(Class<?> zClass, Class<?> untilClass, Object op1, Object op2) throws Exception { + private static boolean compareUntil(Class<?> zClass, Class<?> untilClass, Object op1, Object op2) throws Exception { boolean result = true; // write inherited members first @@ -156,7 +156,7 @@ public class ValueComparer { return result; } - static boolean compareStructs(Object op1, Object op2) throws Exception { + private static boolean compareStructs(Object op1, Object op2) throws Exception { boolean result = true; if(op1.getClass() != op2.getClass()) @@ -168,7 +168,7 @@ public class ValueComparer { return result; } - static boolean compareThrowable(Throwable op1, Throwable op2) throws Exception { + private static boolean compareThrowable(Throwable op1, Throwable op2) throws Exception { boolean result = true; if(op1.getClass() != op2.getClass()) @@ -182,11 +182,11 @@ public class ValueComparer { return result; } - static boolean compareEnums(Enum en1, Enum en2) { + private static boolean compareEnums(Enum en1, Enum en2) { return en1.getValue() == en2.getValue(); } - static boolean compareObjects(Object op1, Object op2) throws Exception { + private static boolean compareObjects(Object op1, Object op2) throws Exception { boolean result = false; if(op1 == op2) diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java index 77ca32fd68e2..aec10a16ba4d 100644 --- a/qadevOOo/runner/util/WriterTools.java +++ b/qadevOOo/runner/util/WriterTools.java @@ -51,7 +51,7 @@ public class WriterTools { return WriterDoc; } // finish createTextDoc - public static XTextDocument loadTextDoc(XMultiServiceFactory xMSF, + private static XTextDocument loadTextDoc(XMultiServiceFactory xMSF, String url, PropertyValue[] Args) { XComponent comp = DesktopTools.loadDoc(xMSF, url, Args); XTextDocument WriterDoc = UnoRuntime.queryInterface( diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index 1b8ccf183ea2..f706d9c5878a 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -275,7 +275,7 @@ public class XMLTools { * Reset all values. This is important e.g. for test of XFilter * interface, where 'filter()' method istbstarted twice. */ - public void reset() { + void reset() { docStarted = false ; docEnded = false ; tagStack = new ArrayList<String>() ; @@ -352,7 +352,7 @@ public class XMLTools { * Also prints "Tag trace" in case if the full XML data isn't * printed. */ - public void printError(String msg) { + void printError(String msg) { log.println("!!! Error: " + msg) ; if (printXMLData) return ; log.println(" Tag trace :") ; @@ -586,7 +586,7 @@ public class XMLTools { return ret ; } - protected boolean checkAttr(int attrListIdx, XAttributeList list) { + private boolean checkAttr(int attrListIdx, XAttributeList list) { short j = 0 ; int listLen = list.getLength(); while(j < listLen) { @@ -609,7 +609,7 @@ public class XMLTools { * with values method checks if these attributes exist and * have appropriate values. */ - public boolean isMatchTo(String tagName, XAttributeList list) { + private boolean isMatchTo(String tagName, XAttributeList list) { if (!name.equals(tagName)) return false; boolean result = true ; for (int i = 0; i < attrList.length; i++) { @@ -813,7 +813,7 @@ public class XMLTools { * XML data is written. * @return SAX handler to which XML data has to be written. */ - public static XDocumentHandler getFileXMLWriter(XMultiServiceFactory xMSF, String fileURL) + private static XDocumentHandler getFileXMLWriter(XMultiServiceFactory xMSF, String fileURL) throws com.sun.star.uno.Exception { XInterface oFacc = (XInterface)xMSF.createInstance( @@ -842,7 +842,7 @@ public class XMLTools { * @param handler SAX handler to which XML data from file will * be transferred. */ - public static void parseXMLFile(XMultiServiceFactory xMSF, + private static void parseXMLFile(XMultiServiceFactory xMSF, String fileURL, XDocumentHandler handler) throws com.sun.star.uno.Exception { XInterface oFacc = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/runner/util/compare/GraphicalComparator.java b/qadevOOo/runner/util/compare/GraphicalComparator.java index 47b99b8aa218..f52e8f0bbfd7 100644 --- a/qadevOOo/runner/util/compare/GraphicalComparator.java +++ b/qadevOOo/runner/util/compare/GraphicalComparator.java @@ -75,7 +75,7 @@ class GraphicalComparator implements DocComparator * replacing the path equals to _sInputPath with _sReferencePath and replace it's suffix by _sNewSuffix. * If _sInputPath is empty, replace the whole path by _sReferencePath. */ - protected String createSpecialFile(String _sEntry, String _sInputPath, String _sReferencePath, String _sNewSuffix) + private String createSpecialFile(String _sEntry, String _sInputPath, String _sReferencePath, String _sNewSuffix) { String fs = System.getProperty("file.separator"); String sNewSubDir = ""; @@ -100,7 +100,7 @@ class GraphicalComparator implements DocComparator return sNewReferencePath; } - boolean isReferenceOrDiffExistent(String _sNewSuffix) + private boolean isReferenceOrDiffExistent(String _sNewSuffix) { boolean isExistent = false; diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java index 43a25668c1b8..99b0929bfbb4 100644 --- a/qadevOOo/runner/util/dbg.java +++ b/qadevOOo/runner/util/dbg.java @@ -54,7 +54,7 @@ public class dbg { * @param extendedInfo Should extended information be printed? * @see com.sun.star.uno.XInterface */ - public static void printInterfaces(XInterface xTarget, + private static void printInterfaces(XInterface xTarget, boolean extendedInfo){ Type[] types = getInterfaceTypes(xTarget); if( null != types ) { @@ -75,7 +75,7 @@ public class dbg { * @return An array with all interface types; null if there are none. * @see com.sun.star.uno.XInterface */ - public static Type[] getInterfaceTypes(XInterface xTarget) { + private static Type[] getInterfaceTypes(XInterface xTarget) { Type[] types = null; XTypeProvider xTypeProvider = UnoRuntime.queryInterface( XTypeProvider.class, xTarget); if( xTypeProvider != null ) @@ -113,7 +113,7 @@ public class dbg { * @param aType The type of the given interface. * @see com.sun.star.uno.Type */ - public static void printInterfaceInfo(Type aType) { + private static void printInterfaceInfo(Type aType) { try { Class<?> zClass = aType.getZClass(); Method[] methods = zClass.getDeclaredMethods(); @@ -223,7 +223,7 @@ public class dbg { * @param out The print writer which is used as output. * @see com.sun.star.beans.PropertyValue */ - public static void printProperyValueSequenzePairs(PropertyValue[] ps, PrintWriter out){ + private static void printProperyValueSequenzePairs(PropertyValue[] ps, PrintWriter out){ for( int i = 0; i < ps.length; i++){ printProperyValuePairs(ps[i], out); } @@ -244,7 +244,7 @@ public class dbg { * @param out The print writer which is used as output. * @see com.sun.star.beans.PropertyValue */ - public static void printProperyValuePairs(PropertyValue ps, PrintWriter out){ + private static void printProperyValuePairs(PropertyValue ps, PrintWriter out){ if (ps.Value instanceof String[] ){ String[] values = (String[]) ps.Value; diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index 183daadee8dc..73664ce6989a 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -286,7 +286,7 @@ public class utils { * @see com.sun.star.util.PathSettings * @return the value as String */ - public static String getOfficeSettingsValue(XMultiServiceFactory msf, String setting) { + private static String getOfficeSettingsValue(XMultiServiceFactory msf, String setting) { String settingPath = null; try { @@ -813,7 +813,7 @@ public class utils { * @param checkAppExecutionCommand If the AppExecutionCommand is checked, the error messages willbe different. * @return The error message, or OK, if no error was detected. */ - public static String validateConnectString(String connectString, boolean checkAppExecutionCommand) { + private static String validateConnectString(String connectString, boolean checkAppExecutionCommand) { String acceptPrefix = ""; if (checkAppExecutionCommand) { acceptPrefix = "--accept="; @@ -926,7 +926,7 @@ public class utils { * @param URL the <CODE>URL</CODE> to dispatch * @throws java.lang.Exception throws <CODE>java.lang.Exception</CODE> on any error */ - public static void dispatchURL(XMultiServiceFactory xMSF, XController xCont, String URL) throws java.lang.Exception { + private static void dispatchURL(XMultiServiceFactory xMSF, XController xCont, String URL) throws java.lang.Exception { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xCont); diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 9e8998978b06..bdf03b0323ce 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -484,7 +484,7 @@ public class SDBCReportDataFactory implements DataSourceFactory return paramDef; } - void fillOrderStatement(final String command, + private void fillOrderStatement(final String command, final int commandType, final Map parameters, final XConnectionTools tools, final XPropertySet rowSetProp) diff --git a/reportbuilder/java/org/libreoffice/report/StorageRepository.java b/reportbuilder/java/org/libreoffice/report/StorageRepository.java index d242b42d3899..dbb1266a3de6 100644 --- a/reportbuilder/java/org/libreoffice/report/StorageRepository.java +++ b/reportbuilder/java/org/libreoffice/report/StorageRepository.java @@ -217,7 +217,7 @@ public class StorageRepository implements InputRepository, OutputRepository throw new IOException(); } - final String shortenName(final String name) + private final String shortenName(final String name) { final String temp; if (name.startsWith("./")) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java b/reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java index ca69be4b63a6..6706426b25ca 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/DefaultNameGenerator.java @@ -126,7 +126,7 @@ public class DefaultNameGenerator return newName; } - protected String getSuffixForType(final String mimeType) + private String getSuffixForType(final String mimeType) { if ("image/png".equals(mimeType)) { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java index fc8b4ff4b2d1..b7c480467305 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java @@ -413,7 +413,7 @@ public class PentahoReportJob implements ReportJob } - protected ReportProcessor getProcessorForContentType(final String mimeType) + private ReportProcessor getProcessorForContentType(final String mimeType) throws ReportExecutionException { final ReportProcessor ret; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java index 80a7da82e57a..ff0aca9a308f 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java @@ -133,7 +133,7 @@ public final class SOFormulaOpCodeMapper extends WeakBase * This method is a simple helper function to used in the static component initialisation functions as well as * in getSupportedServiceNames. */ - public static String[] getServiceNames() + private static String[] getServiceNames() { return new String[] { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java index a67a3d026143..b3648efa469c 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java @@ -131,7 +131,7 @@ public class SOReportJobFactory * This method is a simple helper function to used in the static component initialisation functions as well as * in getSupportedServiceNames. */ - public static String[] getServiceNames() + private static String[] getServiceNames() { return new String[] { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java index 98dfbf1b1ffd..8704a4e312cf 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java @@ -330,7 +330,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget return outputRepository; } - protected InputRepository getInputRepository() + private InputRepository getInputRepository() { return inputRepository; } @@ -494,7 +494,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget * * @return the processing state. */ - protected int getCurrentState() + private int getCurrentState() { if (states.isEmpty()) { @@ -779,7 +779,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget } } - protected void startBody(final AttributeMap attrs) + private void startBody(final AttributeMap attrs) throws IOException { getXmlWriter().writeTag(OfficeNamespaces.OFFICE_NS, "body", XmlWriterSupport.OPEN); @@ -822,7 +822,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget { } - protected void startGroupBody(final AttributeMap attrs) + private void startGroupBody(final AttributeMap attrs) { } @@ -993,7 +993,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget { } - protected void endGroupInstance(final AttributeMap attrs) + private void endGroupInstance(final AttributeMap attrs) { } @@ -1023,7 +1023,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget protected abstract void endContent(final AttributeMap attrs) throws IOException, DataSourceException, ReportProcessingException; - protected void endBody(final AttributeMap attrs) + private void endBody(final AttributeMap attrs) throws IOException { getXmlWriter().writeCloseTag(); @@ -1230,7 +1230,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget return attrList; } - protected String sanitizeName(final String name) + private String sanitizeName(final String name) { // A table name cannot contain spaces and should only contain // ascii-characters. @@ -1574,7 +1574,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget return null; } - protected CSSNumericValue computeColumnWidth(final String colStyle) + private CSSNumericValue computeColumnWidth(final String colStyle) { final OfficeStylesCollection contentStyles = getContentStylesCollection(); final OfficeStyle style = contentStyles.getStyle(OfficeToken.TABLE_COLUMN, colStyle); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java index 890958e219ae..4797d2ad4f65 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StylesWriter.java @@ -284,7 +284,7 @@ public class StylesWriter } } - protected AttributeList buildAttributeList(final AttributeMap attrs) + private AttributeList buildAttributeList(final AttributeMap attrs) { final AttributeList attrList = new AttributeList(); final String[] namespaces = attrs.getNameSpaces(); @@ -308,7 +308,7 @@ public class StylesWriter return attrList; } - protected boolean isFilteredNamespace(final String namespace) + private boolean isFilteredNamespace(final String namespace) { if (Namespaces.LIBLAYOUT_NAMESPACE.equals(namespace)) { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java index 05ca93ad990e..ca4dbd9a9764 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/chart/ChartRawReportTarget.java @@ -68,7 +68,7 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget return "application/vnd.oasis.opendocument.chart"; } - protected String getStartContent() + private String getStartContent() { return "chart"; } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java index 777fa20e9333..6283a6ce1856 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java @@ -78,7 +78,7 @@ public class SpreadsheetRawReportProcessor extends AbstractReportProcessor this.dataSourceFactory = dataSourceFactory; } - protected ReportTarget createReportTarget(final ReportJob job) throws ReportProcessingException + private ReportTarget createReportTarget(final ReportJob job) throws ReportProcessingException { final ReportStructureRoot report = job.getReportStructureRoot(); final ResourceManager resourceManager = report.getResourceManager(); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java index 8c4807c28ddb..44d33cd48bbf 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java @@ -719,7 +719,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget } } - protected String getStartContent() + private String getStartContent() { return "spreadsheet"; } diff --git a/sc/qa/complex/dataPilot/_XPropertySet.java b/sc/qa/complex/dataPilot/_XPropertySet.java index 9fd8f3b8bf80..8ccad66268a1 100644 --- a/sc/qa/complex/dataPilot/_XPropertySet.java +++ b/sc/qa/complex/dataPilot/_XPropertySet.java @@ -549,7 +549,7 @@ public class _XPropertySet { * Retrieves one random property name from list (property names separated * by ';') of property names. */ - public String getRandomString(String str) { + private String getRandomString(String str) { String gRS = "none"; Random rnd = new Random(); @@ -564,7 +564,7 @@ public class _XPropertySet { } - public boolean isChangeable(String name) { + private boolean isChangeable(String name) { boolean hasChanged = false; try { Object getProp = oObj.getPropertyValue(name); diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java index ba8ca3adfd9e..dd7017b32df1 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -75,7 +75,7 @@ public class ParcelDescriptor { // returns the ParcelDescriptor in the corresponding directory // returns null if no ParcelDescriptor is found in the directory - public static synchronized ParcelDescriptor + private static synchronized ParcelDescriptor getParcelDescriptor(File parent) { File path = new File(parent, PARCEL_DESCRIPTOR_NAME); @@ -166,7 +166,7 @@ public class ParcelDescriptor { initLanguageProperties(); } - public void write(File file) throws IOException { + private void write(File file) throws IOException { FileOutputStream fos = new FileOutputStream(file); XMLParserFactory.getParser().write(document, fos); fos.close(); @@ -297,7 +297,7 @@ public class ParcelDescriptor { addScriptEntry(scripts.next()); } - public String getLanguageProperty(String name) { + private String getLanguageProperty(String name) { return languagedepprops.get(name); } diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java index 8ec9b0a08fe8..823f2ff731e7 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java +++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java @@ -41,7 +41,7 @@ public class ClassLoaderFactory } return getURLClassLoader( parent, classPath ); } - public static ClassLoader getURLClassLoader( ClassLoader parent, URL[] classpath) + private static ClassLoader getURLClassLoader( ClassLoader parent, URL[] classpath) { return new URLClassLoader( classpath, parent); } diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java index 04ca755a6a72..7c216e494fbb 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java @@ -122,7 +122,7 @@ public class PlainSourceView extends JScrollPane /* If the number of lines in the JTextArea has changed then update the GlyphGutter */ - public void doChanged() { + private void doChanged() { isModified = true; if (linecount != ta.getLineCount()) { diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java index 01f2db7858fa..e4854d26f1bb 100644 --- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java +++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java @@ -77,7 +77,7 @@ public class SVersionRCFile { return(createInstance(DEFAULT_NAME)); } - public static SVersionRCFile createInstance(String name) { + private static SVersionRCFile createInstance(String name) { SVersionRCFile result = null; synchronized(SVersionRCFile.class) { diff --git a/scripting/java/org/openoffice/idesupport/xml/Manifest.java b/scripting/java/org/openoffice/idesupport/xml/Manifest.java index b2bf6101f78e..581cadae51d6 100644 --- a/scripting/java/org/openoffice/idesupport/xml/Manifest.java +++ b/scripting/java/org/openoffice/idesupport/xml/Manifest.java @@ -118,7 +118,7 @@ public class Manifest { return result; } - public void write(OutputStream out) throws IOException { + private void write(OutputStream out) throws IOException { XMLParserFactory.getParser().write(document, out); } } diff --git a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java index 36380a2b6c06..bd5eb48c3f20 100644 --- a/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java +++ b/scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java @@ -81,7 +81,7 @@ public class ParcelZipper return zipParcel(basedir, targetfile, filter); } - public String zipParcel(File basedir, File targetfile, FileFilter filter) + private String zipParcel(File basedir, File targetfile, FileFilter filter) throws IOException { String realpath, tmppath; @@ -557,7 +557,7 @@ public class ParcelZipper return result; } - public String getParcelLanguage(File file) throws IOException { + private String getParcelLanguage(File file) throws IOException { ZipFile zf = null; ZipEntry ze = null; InputStream is = null; diff --git a/scripting/workben/ifc/scripting/ScriptingUtils.java b/scripting/workben/ifc/scripting/ScriptingUtils.java index f10cf53f15b5..84cce3fc48c4 100644 --- a/scripting/workben/ifc/scripting/ScriptingUtils.java +++ b/scripting/workben/ifc/scripting/ScriptingUtils.java @@ -55,7 +55,7 @@ public class ScriptingUtils { return storageManager.getScriptStorage(id); } - public int getStorageId(XMultiServiceFactory xMSF, String location) { + private int getStorageId(XMultiServiceFactory xMSF, String location) { if (location.equals("share")) return 0; @@ -94,7 +94,7 @@ public class ScriptingUtils { return id; } - public XSimpleFileAccess getXSimpleFileAccess(XMultiServiceFactory xMSF) { + private XSimpleFileAccess getXSimpleFileAccess(XMultiServiceFactory xMSF) { XSimpleFileAccess access = null; try { diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java index dc4bb37646e4..ed9fd928e17b 100644 --- a/scripting/workben/installer/InstUtil.java +++ b/scripting/workben/installer/InstUtil.java @@ -150,7 +150,7 @@ public class InstUtil { - public static Properties getJeditLocation() { + private static Properties getJeditLocation() { Properties results = new Properties(); @@ -236,7 +236,7 @@ public class InstUtil { - public static File findVersionFile(File start) + private static File findVersionFile(File start) { File versionFile = null; @@ -261,7 +261,7 @@ public class InstUtil { return versionFile; } - public static boolean verifySversionExists(File sversionFile) { + private static boolean verifySversionExists(File sversionFile) { if (!sversionFile.exists()) return false; return true; @@ -329,11 +329,11 @@ public class InstUtil { return results; } - public static String getJavaVersion() { + private static String getJavaVersion() { return System.getProperty("java.version"); } - public static boolean isCorrectJavaVersion() { + private static boolean isCorrectJavaVersion() { if (System.getProperty("java.version").startsWith("1.4")) return true; return false; diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java index d0753ba3a14c..39d6b3e6dc52 100644 --- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java +++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java @@ -1001,7 +1001,7 @@ public class DocumentMetadataAccess return 0; } - public int cmp(XNode i_Left, XNode i_Right) + private int cmp(XNode i_Left, XNode i_Right) { if (isBlank(i_Left)) { return isBlank(i_Right) ? 0 : 1; diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java index 6686cd96959b..3269408f32f5 100644 --- a/sfx2/qa/complex/sfx2/DocumentProperties.java +++ b/sfx2/qa/complex/sfx2/DocumentProperties.java @@ -70,7 +70,7 @@ public class DocumentProperties m_Called = false; } - public boolean reset() { + private boolean reset() { boolean oldCalled = m_Called; m_Called = false; return oldCalled; diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java index 9f6672f8d8ce..59a5c1c7582a 100644 --- a/sfx2/qa/complex/sfx2/tools/WriterHelper.java +++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java @@ -255,7 +255,7 @@ public class WriterHelper { /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface * @return returns the gained XDesktop interface */ - protected XDesktop getDesktop() { + private XDesktop getDesktop() { Object desk = null; try { diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index 5c51ae70e4cd..54ca81b6e4c4 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -308,7 +308,7 @@ class FrameNode extends TreeNode return super.toString() + "\tname: " + m_Name + "\tanchor: " + toString(m_Anchor); } - static String toString(TextContentAnchorType anchor) { + private static String toString(TextContentAnchorType anchor) { switch (anchor.getValue()) { case AS_CHARACTER_value: return "AS_CHARACTER"; case AT_CHARACTER_value: return "AT_CHARACTER"; @@ -633,25 +633,25 @@ class FuzzyTester m_BufferActual.clear(); } - void printDiff(String prefix, String expected, String actual) + private void printDiff(String prefix, String expected, String actual) { System.out.println(prefix + ":\texpected: " + expected + "\tactual: " + actual); } - void printNesting(TreeNode node, TreeNode nesting) + private void printNesting(TreeNode node, TreeNode nesting) { System.out.println("node: " + node.toString() + " possibly moved across nesting " + nesting.toString()); } - void printMissing(TreeNode node) + private void printMissing(TreeNode node) { System.out.println(" missing node: " + node.toString()); } - void printUnexpected(TreeNode node) + private void printUnexpected(TreeNode node) { System.out.println("unexpected node: " + node.toString()); @@ -675,7 +675,7 @@ class EnumConverter return ret; } - TreeNode convertChildren(XEnumeration xEnum) throws Exception + private TreeNode convertChildren(XEnumeration xEnum) throws Exception { while (xEnum.hasMoreElements()) { TreeNode node; @@ -890,7 +890,7 @@ abstract class Inserter xContent.attach(xCursor); } - XTextContent makeFrame(String name, TextContentAnchorType anchor) + private XTextContent makeFrame(String name, TextContentAnchorType anchor) throws Exception { Object xFrame = @@ -931,7 +931,7 @@ abstract class Inserter } } - XTextContent makeBookmark(String name) throws Exception + private XTextContent makeBookmark(String name) throws Exception { Object xBookmark = m_xDocFactory.createInstance("com.sun.star.text.Bookmark"); @@ -1052,7 +1052,7 @@ class TreeInserter extends Inserter } } - void insertChildren(TreeNodeEnum children) throws Exception + private void insertChildren(TreeNodeEnum children) throws Exception { while (children.hasNext()) { m_xCursor.gotoEndOfParagraph(false); @@ -1147,7 +1147,7 @@ class TreeInserter extends Inserter } } - XParagraphCursor mkCursor(XTextRange xRange) + private XParagraphCursor mkCursor(XTextRange xRange) { XTextCursor xCursor = m_xText.createTextCursorByRange(xRange); XParagraphCursor xParaCursor = UnoRuntime.queryInterface(XParagraphCursor.class, xCursor); @@ -1179,7 +1179,7 @@ class RangeInserter extends Inserter return insertNode(m_xCursor, range.getNode()); } - XTextContent insertNode(XParagraphCursor xCursor, TreeNode node) + private XTextContent insertNode(XParagraphCursor xCursor, TreeNode node) throws Exception { String type = node.getType(); diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 5cdedf4541a9..af5934eb2dda 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -180,7 +180,7 @@ public class Helper return m_pConfigStrings[nID]; } - synchronized protected static HttpClient GetHttpClient() + synchronized private static HttpClient GetHttpClient() throws WikiCancelException { if ( !m_bAllowConnection ) @@ -288,7 +288,7 @@ public class Helper return m_xInteractionHandler; } - protected static Protocol GetOwnHttps( int nPort ) + private static Protocol GetOwnHttps( int nPort ) { return new Protocol( "https", new WikiProtocolSocketFactory(), ( ( nPort < 0 ) ? 443 : nPort ) ); } @@ -553,7 +553,7 @@ public class Helper return aFilterName; } - protected static XMultiServiceFactory GetConfigurationProvider( XComponentContext xContext ) + private static XMultiServiceFactory GetConfigurationProvider( XComponentContext xContext ) throws com.sun.star.uno.Exception { XMultiServiceFactory xConfigurationProvider = null; @@ -570,7 +570,7 @@ public class Helper return xConfigurationProvider; } - protected static Object GetConfig( XComponentContext xContext, String sNodepath, boolean bWriteAccess ) + private static Object GetConfig( XComponentContext xContext, String sNodepath, boolean bWriteAccess ) throws com.sun.star.uno.Exception { if ( xContext == null || sNodepath == null ) @@ -588,7 +588,7 @@ public class Helper aArgs ); } - protected static XPropertySet GetConfigProps( XComponentContext xContext, String sNodepath ) + private static XPropertySet GetConfigProps( XComponentContext xContext, String sNodepath ) throws com.sun.star.uno.Exception { XPropertySet xProps = UnoRuntime.queryInterface( XPropertySet.class, GetConfig( xContext, sNodepath, true ) ); @@ -619,7 +619,7 @@ public class Helper return xNameAccess; } - protected static void SetConfigurationProxy( HostConfiguration aHostConfig, XComponentContext xContext ) + private static void SetConfigurationProxy( HostConfiguration aHostConfig, XComponentContext xContext ) { if ( aHostConfig == null || xContext == null ) return; @@ -733,7 +733,7 @@ public class Helper return new HTMLParse().getParser(); } - static protected boolean LoginReportsError( String sRespond ) + static private boolean LoginReportsError( String sRespond ) { boolean bResult = true; if ( sRespond != null ) @@ -756,7 +756,7 @@ public class Helper return bResult; } - static protected String GetLoginToken( String sLoginPage ) + static private String GetLoginToken( String sLoginPage ) { String sResult = ""; if ( sLoginPage != null && sLoginPage.length() > 0 ) diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java index 432a959a854f..b7e4e2537a44 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java @@ -73,7 +73,7 @@ public class Settings return m_WikiConnections; } - public String getWikiConUrlByNumber( int num ) + private String getWikiConUrlByNumber( int num ) { String url = ""; if ( num >=0 && num < m_WikiConnections.size() ) @@ -181,7 +181,7 @@ public class Settings return ht; } - public Map<String,Object> getDocByCompleteUrl( String curl ) + private Map<String,Object> getDocByCompleteUrl( String curl ) { Map<String,Object> ht = null; for( int i=0;i<m_aWikiDocs.size();i++ ) diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java index fe31b4741ebd..b4c445edfda6 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java @@ -237,7 +237,7 @@ public class WikiArticle return bResult; } - protected boolean Login() + private boolean Login() throws java.io.IOException, WikiCancelException { m_aHostConfig = Helper.Login( m_aMainURI, m_sWikiUser, m_sWikiPass, m_xContext ); diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java index 0005da4fd5ba..6f1f6d61f13f 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java @@ -122,7 +122,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener SetTitle( m_xDialog, sTitle ); } - public static void SetTitle( XDialog xDialog, String sTitle ) + private static void SetTitle( XDialog xDialog, String sTitle ) throws Exception { if ( xDialog != null && sTitle != null ) @@ -142,7 +142,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener return GetPropSet( m_xControlContainer, sControl ); } - protected static XPropertySet GetPropSet( XControlContainer xControlContainer, String sControl ) + private static XPropertySet GetPropSet( XControlContainer xControlContainer, String sControl ) { XPropertySet xPS = null; diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index 384e77b79c08..be60ba30d8d8 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -123,7 +123,7 @@ public class WikiEditSettingDialog extends WikiDialog return bResult; } - public void EnableControls( boolean bEnable ) + private void EnableControls( boolean bEnable ) { if ( !bEnable ) SetFocusTo( "CancelButton" ); @@ -189,7 +189,7 @@ public class WikiEditSettingDialog extends WikiDialog } } - public void DoLogin() + private void DoLogin() { String sRedirectURL = ""; String sURL = ""; diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index 83980c05c895..969af1689474 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -204,7 +204,7 @@ public final class WikiEditorImpl extends WeakBase } } - public void callStatusListener( String uristring ) + private void callStatusListener( String uristring ) { try { @@ -225,7 +225,7 @@ public final class WikiEditorImpl extends WeakBase url.Complete = urlstring; } - public void sendArticle() + private void sendArticle() { if ( m_xFrame != null ) { diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java index daa35a47f1dd..b44e0d9d7c44 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java @@ -60,7 +60,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase m_xContext = xContext; } - protected XPropertySet GetPropSet( String sControl ) + private XPropertySet GetPropSet( String sControl ) { if ( m_xControlContainer != null ) { diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index 48f4c424c624..650348737ab1 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java @@ -145,7 +145,7 @@ public class WikiPropDialog extends WikiDialog{ } } - public void fillDocList() + private void fillDocList() { XPropertySet xPS = GetPropSet("ArticleText"); try @@ -180,7 +180,7 @@ public class WikiPropDialog extends WikiDialog{ } - public void switchSendButtonIfNecessary() + private void switchSendButtonIfNecessary() { XPropertySet xSendButton = GetPropSet( "SendButton" ); if ( xSendButton != null ) @@ -206,7 +206,7 @@ public class WikiPropDialog extends WikiDialog{ } } - public void EnableControls( boolean bEnable ) + private void EnableControls( boolean bEnable ) { try { diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java index 95e31b1b3b1d..f86d838d4315 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java @@ -44,7 +44,7 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory super(); } - public synchronized SSLContext GetNotSoSecureSSLContext() + private synchronized SSLContext GetNotSoSecureSSLContext() { if ( m_aSSLContext == null ) { diff --git a/toolkit/qa/complex/toolkit/Assert.java b/toolkit/qa/complex/toolkit/Assert.java index a413fb8e7ff3..1077fb308813 100644 --- a/toolkit/qa/complex/toolkit/Assert.java +++ b/toolkit/qa/complex/toolkit/Assert.java @@ -187,7 +187,7 @@ public class Assert * @param i_expectedExceptionClass is the class of the exception to be caught. If this is null, * it means that <em>no</em> exception must be throw by invoking the method. */ - public static void assertException( final Object i_object, final String i_methodName, final Object[] i_methodArgs, + private static void assertException( final Object i_object, final String i_methodName, final Object[] i_methodArgs, final Class<?> i_expectedExceptionClass ) { assertException( diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java index 510b1b268a26..13382ea3e24e 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java @@ -64,7 +64,7 @@ public class _XAccessibleEventBroadcaster { xWindow = window; } - public void fireEvent() { + private void fireEvent() { Rectangle newPosSize = xWindow.getPosSize(); newPosSize.Width = newPosSize.Width - 20; newPosSize.Height = newPosSize.Height - 20; @@ -170,7 +170,7 @@ public class _XAccessibleEventBroadcaster { } - protected static boolean chkTransient(Object Testcase) { + private static boolean chkTransient(Object Testcase) { XAccessibleContext accCon = UnoRuntime.queryInterface(XAccessibleContext.class, Testcase); if (accCon.getAccessibleStateSet().contains( com.sun.star.accessibility.AccessibleStateType.TRANSIENT)){ diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java index 88393b2fbf37..0471acb29c6e 100644 --- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java +++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java @@ -143,7 +143,7 @@ public class DocumentHandle { * @param newPosSize The new position and size of the window. * @return True if resize worked. */ - public boolean resizeDocument(Rectangle newPosSize){ + private boolean resizeDocument(Rectangle newPosSize){ wl.resetTrigger(); xWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, newPosSize.Height, PosSize.POSSIZE); diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index c61810dee083..ab774d787e2e 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -196,7 +196,7 @@ public abstract class Configuration } } - public static String getLocaleString(XMultiServiceFactory xMSF, String root, String key) + private static String getLocaleString(XMultiServiceFactory xMSF, String root, String key) { String sLocale = PropertyNames.EMPTY_STRING; try @@ -215,7 +215,7 @@ public abstract class Configuration return sLocale; } - public static Locale getLocale(XMultiServiceFactory xMSF, String root, String key) + private static Locale getLocale(XMultiServiceFactory xMSF, String root, String key) { Locale aLocLocale = new Locale(); String sLocale = getLocaleString(xMSF, root, key); @@ -382,7 +382,7 @@ public abstract class Configuration return getChildNodebyDisplayName(_xNameAccessNode, _displayname, PropertyNames.PROPERTY_NAME); } - public static XNameAccess getChildNodebyDisplayName(XNameAccess _xNameAccessNode, String _displayname, String _nodename) + private static XNameAccess getChildNodebyDisplayName(XNameAccess _xNameAccessNode, String _displayname, String _nodename) { String[] snames = null; try diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index f6f39533371b..fc6d15866b87 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -80,7 +80,7 @@ public class Desktop return xFrameSuppl.getActiveFrame(); } - public static XComponent getActiveComponent(XMultiServiceFactory _xMSF) + private static XComponent getActiveComponent(XMultiServiceFactory _xMSF) { XFrame xFrame = getActiveFrame(_xMSF); return UnoRuntime.queryInterface(XComponent.class, xFrame.getController().getModel()); @@ -98,7 +98,7 @@ public class Desktop return UnoRuntime.queryInterface(XSpreadsheetDocument.class, xComponent); } - public static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) + private static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL) { try { @@ -114,7 +114,7 @@ public class Desktop return null; } - public static com.sun.star.util.URL getDispatchURL(XMultiServiceFactory xMSF, String _sURL) + private static com.sun.star.util.URL getDispatchURL(XMultiServiceFactory xMSF, String _sURL) { try { @@ -133,7 +133,7 @@ public class Desktop return null; } - public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) + private static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe) { com.sun.star.util.URL oURL = getDispatchURL(xMSF, sURL); XDispatch xDispatch = getDispatcher(xFrame, _stargetframe, oURL); @@ -145,13 +145,13 @@ public class Desktop dispatchURL(xMSF, sURL, xFrame, PropertyNames.EMPTY_STRING); } - public static void dispatchURL(XDispatch _xDispatch, com.sun.star.util.URL oURL) + private static void dispatchURL(XDispatch _xDispatch, com.sun.star.util.URL oURL) { PropertyValue[] oArg = new PropertyValue[0]; _xDispatch.dispatch(oURL, oArg); } - public static XMultiComponentFactory getMultiComponentFactory() throws com.sun.star.uno.Exception, RuntimeException, java.lang.Exception + private static XMultiComponentFactory getMultiComponentFactory() throws com.sun.star.uno.Exception, RuntimeException, java.lang.Exception { XComponentContext xcomponentcontext = Bootstrap.createInitialComponentContext(null); // initial serviceManager @@ -188,7 +188,7 @@ public class Desktop return sIncSuffix; } - public static String getIncrementSuffix(XHierarchicalNameAccess xElementContainer, String ElementName) + private static String getIncrementSuffix(XHierarchicalNameAccess xElementContainer, String ElementName) { boolean bElementexists = true; int i = 1; @@ -210,7 +210,7 @@ public class Desktop return sIncSuffix; } - public static int checkforfirstSpecialCharacter(XMultiServiceFactory _xMSF, String _sString, Locale _aLocale) + private static int checkforfirstSpecialCharacter(XMultiServiceFactory _xMSF, String _sString, Locale _aLocale) { try { @@ -353,7 +353,7 @@ public class Desktop } } - public static String getTemplatePath(XMultiServiceFactory _xMSF) + private static String getTemplatePath(XMultiServiceFactory _xMSF) { try { diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index 106f5bd33346..febdb5612ac8 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -75,7 +75,7 @@ public class FileAccess ResultPath += PropertyNames.SEMI_COLON + sAddPath; } - public static String deleteLastSlashfromUrl(String _sPath) + private static String deleteLastSlashfromUrl(String _sPath) { if (_sPath.endsWith("/")) { @@ -361,7 +361,7 @@ public class FileAccess return ReturnPath; } - public static boolean createSubDirectory(XMultiServiceFactory xMSF, XSimpleFileAccess xSimpleFileAccess, String Path) + private static boolean createSubDirectory(XMultiServiceFactory xMSF, XSimpleFileAccess xSimpleFileAccess, String Path) { String sNoDirCreation = PropertyNames.EMPTY_STRING; try @@ -540,7 +540,7 @@ public class FileAccess /** * We search in all given path for a given file */ - public static String addPath(String _sPath, String _sPath2) + private static String addPath(String _sPath, String _sPath2) { String sNewPath; if (!_sPath.endsWith("/")) @@ -718,7 +718,7 @@ public class FileAccess /** * @return the extension of the given filename. */ - public static String getExtension(String filename) + private static String getExtension(String filename) { int p = filename.indexOf("."); if (p == -1) @@ -736,7 +736,7 @@ public class FileAccess return filename; } - public boolean mkdir(String s) + private boolean mkdir(String s) { try { @@ -842,7 +842,7 @@ public class FileAccess return getFilename(path, File.separator); } - public static String getFilename(String path, String pathSeparator) + private static String getFilename(String path, String pathSeparator) { String[] s = JavaTools.ArrayoutofString(path, pathSeparator); return s[s.length - 1]; @@ -919,7 +919,7 @@ public class FileAccess } } - public String getNewFile(String parentDir, String name, String extension) + private String getNewFile(String parentDir, String name, String extension) { int i = 0; diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index 798378e7e359..9287bbccea31 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -270,7 +270,7 @@ public class Helper * @param oValue the parameter that has to represent an object * @return a null reference if the array is empty */ - public static Object getArrayValue(Object oValue) + private static Object getArrayValue(Object oValue) { try { @@ -347,7 +347,7 @@ public class Helper * @param date a VCL date in form of 20041231 * @return a document relative date */ - public synchronized double getDocumentDateAsDouble(int date) + private synchronized double getDocumentDateAsDouble(int date) { calendar.clear(); calendar.set(date / 10000, @@ -362,12 +362,12 @@ public class Helper return (date1 - docNullTime) / DAY_IN_MILLIS + 1; } - public double getDocumentDateAsDouble(DateTime date) + private double getDocumentDateAsDouble(DateTime date) { return getDocumentDateAsDouble(date.Year * 10000 + date.Month * 100 + date.Day); } - public synchronized double getDocumentDateAsDouble(long javaTimeInMillis) + private synchronized double getDocumentDateAsDouble(long javaTimeInMillis) { calendar.clear(); JavaTools.setTimeInMillis(calendar, javaTimeInMillis); diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java index 109e0f091837..0c52e9115d52 100644 --- a/wizards/com/sun/star/wizards/common/JavaTools.java +++ b/wizards/com/sun/star/wizards/common/JavaTools.java @@ -372,7 +372,7 @@ public class JavaTools } } - public static String getFilenameOutOfPath(String sPath) + private static String getFilenameOutOfPath(String sPath) { String[] Hierarchy = ArrayoutofString(sPath, "/"); return Hierarchy[Hierarchy.length - 1]; @@ -421,7 +421,7 @@ public class JavaTools return dt; } - public static long getTimeInMillis(Calendar _calendar) + private static long getTimeInMillis(Calendar _calendar) { java.util.Date dDate = _calendar.getTime(); return dDate.getTime(); @@ -591,7 +591,7 @@ public class JavaTools return -1; } - public static boolean isEqual(PropertyValue firstPropValue, PropertyValue secPropValue) + private static boolean isEqual(PropertyValue firstPropValue, PropertyValue secPropValue) { if (!firstPropValue.Name.equals(secPropValue.Name)) { diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index b05b7624d39e..273af7def411 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -151,7 +151,7 @@ public class NumberFormatter /** * @return a numberformat for a FormatString. */ - public int defineNumberFormat(String _FormatString, Locale _aLocale) + private int defineNumberFormat(String _FormatString, Locale _aLocale) { try { diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 58f53d8f4f0c..95c24a0b061e 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -84,7 +84,7 @@ public class NumericalHelper * @return a byte * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted */ - public static byte toByte(Object aValue) + private static byte toByte(Object aValue) throws com.sun.star.lang.IllegalArgumentException { @@ -295,7 +295,7 @@ public class NumericalHelper @return true, if the parameter aValue is type of real numbers @deprecate, use isRealNumber() instead. */ - public static boolean isNumerical(Object aValue) + private static boolean isNumerical(Object aValue) { try { @@ -335,7 +335,7 @@ public class NumericalHelper @param aValue a object this can contain anything * @return true, if the value is type of any integer values. double / float are not(!) integer values */ - public static boolean isInteger(Object aValue) throws com.sun.star.lang.IllegalArgumentException + private static boolean isInteger(Object aValue) throws com.sun.star.lang.IllegalArgumentException { TypeObject aTypeObject = getTypeObject(aValue); switch (aTypeObject.iType) @@ -449,7 +449,7 @@ public class NumericalHelper * @return a long * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted */ - public static long toLong(Object aValue) + private static long toLong(Object aValue) throws com.sun.star.lang.IllegalArgumentException { long retValue = 0; @@ -504,7 +504,7 @@ public class NumericalHelper * @return a float * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted */ - public static float toFloat(Object aValue) + private static float toFloat(Object aValue) throws com.sun.star.lang.IllegalArgumentException { float retValue = (float) 0.0; @@ -614,7 +614,7 @@ public class NumericalHelper * @return a String * @throws com.sun.star.lang.IllegalArgumentException if the object cannot be converted */ - public static String toString(Object aValue) + private static String toString(Object aValue) throws com.sun.star.lang.IllegalArgumentException { String retValue = null; @@ -718,7 +718,7 @@ public class NumericalHelper * @param anArrayValue a value that is constructed into an array * @return an integer array */ - public static int[] toIntArray(Object anArrayValue) + private static int[] toIntArray(Object anArrayValue) throws com.sun.star.lang.IllegalArgumentException { int[] retValue = null; @@ -747,7 +747,7 @@ public class NumericalHelper * @param anArrayValue a value that is constructed into an array * @return a byte array */ - public static byte[] toByteArray(Object anArrayValue) + private static byte[] toByteArray(Object anArrayValue) throws com.sun.star.lang.IllegalArgumentException { byte[] retValue = null; @@ -776,7 +776,7 @@ public class NumericalHelper * @param anArrayValue a value that is constructed into an array * @return a short array */ - public static short[] toShortArray(Object anArrayValue) + private static short[] toShortArray(Object anArrayValue) throws com.sun.star.lang.IllegalArgumentException { short[] retValue = null; @@ -805,7 +805,7 @@ public class NumericalHelper * @param anArrayValue a value that is constructed into an array * @return a short array */ - public static String[] toStringArray(Object anArrayValue) + private static String[] toStringArray(Object anArrayValue) throws com.sun.star.lang.IllegalArgumentException { String[] retValue = null; @@ -1134,7 +1134,7 @@ public class NumericalHelper * @return * @throws com.sun.star.lang.IllegalArgumentException */ - static int getInt(TypeObject typeObject) + private static int getInt(TypeObject typeObject) throws com.sun.star.lang.IllegalArgumentException { if (typeObject.iType != INT_TYPE) @@ -1149,7 +1149,7 @@ public class NumericalHelper * get the simple float type * @throws com.sun.star.lang.IllegalArgumentException */ - static float getFloat(TypeObject typeObject) + private static float getFloat(TypeObject typeObject) throws com.sun.star.lang.IllegalArgumentException { if (typeObject.iType != FLOAT_TYPE) @@ -1348,7 +1348,7 @@ public class NumericalHelper return roundDouble(_Dblvalue.doubleValue(), _ndecimals); } - public static double roundDouble(double _dblvalue, int _ndecimals) + private static double roundDouble(double _dblvalue, int _ndecimals) { double dblfactor = java.lang.Math.pow(10.0, _ndecimals); return ((int) (_dblvalue * dblfactor)) / dblfactor; diff --git a/wizards/com/sun/star/wizards/common/ParaStyled.java b/wizards/com/sun/star/wizards/common/ParaStyled.java index 31d7327ca320..48ba18f7e625 100644 --- a/wizards/com/sun/star/wizards/common/ParaStyled.java +++ b/wizards/com/sun/star/wizards/common/ParaStyled.java @@ -32,7 +32,7 @@ class ParaStyled implements TemplateElement paraStyle = paraStyle_; } - void format(Object textRange) + private void format(Object textRange) { XText o; o = UnoRuntime.queryInterface(XText.class, textRange); diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index ea0a84cbd983..e9aa2f42c858 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -69,7 +69,7 @@ public class PlaceholderTextElement extends TextElement } } - public static XTextContent createPlaceHolder(XMultiServiceFactory xmsf, String ph, String hint) + private static XTextContent createPlaceHolder(XMultiServiceFactory xmsf, String ph, String hint) { Object placeHolder; try diff --git a/wizards/com/sun/star/wizards/common/Properties.java b/wizards/com/sun/star/wizards/common/Properties.java index 4c4a69df044e..ee098842e2ac 100644 --- a/wizards/com/sun/star/wizards/common/Properties.java +++ b/wizards/com/sun/star/wizards/common/Properties.java @@ -64,7 +64,7 @@ public class Properties extends HashMap<String,Object> return getProperties(this); } - public static PropertyValue[] getProperties(Map<String,Object> map) + private static PropertyValue[] getProperties(Map<String,Object> map) { PropertyValue[] pv = new PropertyValue[map.size()]; @@ -76,7 +76,7 @@ public class Properties extends HashMap<String,Object> return pv; } - public static PropertyValue createProperty(String name, Map<String,Object> map) + private static PropertyValue createProperty(String name, Map<String,Object> map) { return createProperty(name, map.get(name)); } diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java index 304b6e58b1bc..f319000cd9c9 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java @@ -72,7 +72,7 @@ public class PropertySetHelper @param _sName name of the property to set @param _aValue property value as object */ - public void setPropertyValue(String _sName, Object _aValue) throws java.lang.Exception + private void setPropertyValue(String _sName, Object _aValue) throws java.lang.Exception { if (m_xPropertySet != null) { @@ -351,7 +351,7 @@ public class PropertySetHelper /** Debug helper, to show all properties which are available in the current object. */ - public void showProperties() + private void showProperties() { String sName = PropertyNames.EMPTY_STRING; diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index 5e03edb45126..cf744fe779c5 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -128,7 +128,7 @@ public class SystemDialog * * given url to a local path. */ - public String callStoreDialog(String displayDir, String defaultName) + private String callStoreDialog(String displayDir, String defaultName) { sStorePath = null; try @@ -197,7 +197,7 @@ public class SystemDialog } //("writer_StarOffice_XML_Writer_Template") 'StarOffice XML (Writer) - public void addFilterToDialog(String sExtension, String filterName, boolean setToDefault) + private void addFilterToDialog(String sExtension, String filterName, boolean setToDefault) { try { @@ -214,7 +214,7 @@ public class SystemDialog } } - public void addFilter(String uiName, String pattern, boolean setToDefault) + private void addFilter(String uiName, String pattern, boolean setToDefault) { try { @@ -373,7 +373,7 @@ public class SystemDialog return iMessage; } - public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) + private static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) { Object xPathSubst = null; try diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index 973345a7a882..304f4d610c4b 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -359,7 +359,7 @@ public class CommandMetaData extends DBMetaData CommandType = _commandType; } - public boolean isnumeric(FieldColumn _oFieldColumn) + private boolean isnumeric(FieldColumn _oFieldColumn) { try { @@ -652,7 +652,7 @@ public class CommandMetaData extends DBMetaData return skeycolumnnames; } - public void setCommandComposingAttributes() + private void setCommandComposingAttributes() { try { diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 5dda8ef4f3aa..161af0457c6c 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -131,7 +131,7 @@ public class CommandName } } - public void setComposedCommandName() + private void setComposedCommandName() { if (this.setMetaDataAttributes()) { @@ -186,7 +186,7 @@ public class CommandName } } - public String quoteName(String _sName) + private String quoteName(String _sName) { if (baddQuotation) { diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 4204ebcc48f8..980221dba203 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -567,7 +567,7 @@ public class DBMetaData } } - public void getDataSourceInterfaces() throws Exception + private void getDataSourceInterfaces() throws Exception { xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, getDataSource() ); bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue(); @@ -785,7 +785,7 @@ public class DBMetaData return supportsPrimaryKeys; } - public boolean supportsCoreSQLGrammar() + private boolean supportsCoreSQLGrammar() { try { @@ -909,7 +909,7 @@ public class DBMetaData * the document may not be open * @param i_createTemplate describes the type of the document: "form" or "report" */ - public void addDatabaseDocument(XComponent _xComponent, XHierarchicalNameAccess _xDocNameAccess, boolean i_createTemplate) + private void addDatabaseDocument(XComponent _xComponent, XHierarchicalNameAccess _xDocNameAccess, boolean i_createTemplate) { try { diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java index b153908df7f0..a2c0b090359a 100644 --- a/wizards/com/sun/star/wizards/db/FieldColumn.java +++ b/wizards/com/sun/star/wizards/db/FieldColumn.java @@ -386,7 +386,7 @@ public class FieldColumn } } - public void initDefaultValue() + private void initDefaultValue() { switch (getFieldType()) { diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 946bf8838db4..4f8cb8994e14 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -125,7 +125,7 @@ public class RecordParser extends QueryMetaData return Any.VOID; } - public Object getColumnValue(int ColIndex, int iType) + private Object getColumnValue(int ColIndex, int iType) { Object oAny = Any.VOID; switch (iType) diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 16abe115d3fa..7cdc8678b8d2 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -109,7 +109,7 @@ public class SQLQueryComposer return sSelectClause; } - public String getAliasFieldNameClause(String _FieldName) + private String getAliasFieldNameClause(String _FieldName) { String FieldTitle = CurDBMetaData.getFieldTitle(_FieldName); if (!FieldTitle.equals(_FieldName)) @@ -142,7 +142,7 @@ public class SQLQueryComposer prependSortingCriteria(false); } - public void prependSortingCriteria(boolean _baddAliasFieldNames) throws SQLException + private void prependSortingCriteria(boolean _baddAliasFieldNames) throws SQLException { XIndexAccess xColumnIndexAccess = m_xQueryAnalyzer.getOrderColumns(); m_queryComposer.setOrder(""); @@ -183,7 +183,7 @@ public class SQLQueryComposer m_queryComposer.appendOrderByColumn(xColumn, bascend); } - public void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException + private void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException { String sOrder = ""; m_queryComposer.setOrder(""); @@ -212,7 +212,7 @@ public class SQLQueryComposer sOrder = m_queryComposer.getOrder(); } - public void appendGroupByColumns(boolean _baddAliasFieldNames) throws SQLException + private void appendGroupByColumns(boolean _baddAliasFieldNames) throws SQLException { for (int i = 0; i < CurDBMetaData.GroupFieldNames.length; i++) { @@ -280,12 +280,12 @@ public class SQLQueryComposer return setQueryCommand(_xParentWindow, _bincludeGrouping, _baddAliasFieldNames, true); } - public boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery) + private boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery) { return setQueryCommand(_xParentWindow, _bincludeGrouping, _baddAliasFieldNames, addQuery, false); } - public boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery, boolean prependSortingCriteria) + private boolean setQueryCommand(XWindow _xParentWindow, boolean _bincludeGrouping, boolean _baddAliasFieldNames, boolean addQuery, boolean prependSortingCriteria) { try { @@ -362,7 +362,7 @@ public class SQLQueryComposer return null; } - public CommandName getComposedCommandByDisplayName(String _DisplayName) + private CommandName getComposedCommandByDisplayName(String _DisplayName) { if (composedCommandNames != null) { @@ -377,7 +377,7 @@ public class SQLQueryComposer return null; } - public String getuniqueAliasName(String _TableName) + private String getuniqueAliasName(String _TableName) { int a = 0; String AliasName = ""; @@ -404,7 +404,7 @@ public class SQLQueryComposer return CommandName.quoteName(_sname, CurDBMetaData.getIdentifierQuote()); } - public void displaySQLErrorDialog(Exception _exception, XWindow _xParentWindow) + private void displaySQLErrorDialog(Exception _exception, XWindow _xParentWindow) { try { diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index 7de631020ced..db77203b62c6 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -137,7 +137,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } } - public boolean createPrimaryKeys(String[] _fieldnames, boolean _bAutoincrementation) + private boolean createPrimaryKeys(String[] _fieldnames, boolean _bAutoincrementation) { try { @@ -203,7 +203,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen return false; } - public boolean isColunnNameDuplicate(XNameAccess _xColumns, XPropertySet _xToBeAppendedPropertySet) + private boolean isColunnNameDuplicate(XNameAccess _xColumns, XPropertySet _xToBeAppendedPropertySet) { try { @@ -384,7 +384,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen } } - public boolean modifyColumn(String _sname, String _spropname, Object _oValue) + private boolean modifyColumn(String _sname, String _spropname, Object _oValue) { try { @@ -667,7 +667,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen return false; } - public XPropertySet addPrimaryKeyColumn(String _columnname) + private XPropertySet addPrimaryKeyColumn(String _columnname) { try { @@ -793,7 +793,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen { } - public boolean appendTableNameToFilter(String _scomposedtablename) + private boolean appendTableNameToFilter(String _scomposedtablename) { boolean bhastoinsert = true; for (int i = 0; i < sTableFilters.length; i++) diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index fa08c1737e93..b0dbda221857 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -242,7 +242,7 @@ public class TypeInspector return -1; } - public boolean supportsDataType(int _curDataType) + private boolean supportsDataType(int _curDataType) { return (JavaTools.FieldInIntTable(nDataTypeInfos, _curDataType) > -1); } diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index 3ba66acbff60..1da3b217548b 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -83,7 +83,7 @@ public class Control extends Shape createControl(_icontroltype, null, null); } - public void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName) + private void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName) { try { @@ -117,7 +117,7 @@ public class Control extends Shape } } - public void insertControlInContainer(String _fieldname) + private void insertControlInContainer(String _fieldname) { try { @@ -135,7 +135,7 @@ public class Control extends Shape } } - public String getControlName(String _fieldname) + private String getControlName(String _fieldname) { String controlname = PropertyNames.EMPTY_STRING; switch (getControlType()) @@ -227,7 +227,7 @@ public class Control extends Shape } } - public Size getPreferredSize(String sText) + private Size getPreferredSize(String sText) { try { diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 97298e864d25..d896560c8775 100644 --- a/wizards/com/sun/star/wizards/document/DatabaseControl.java +++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java @@ -53,7 +53,7 @@ public class DatabaseControl extends Control createGridColumn(_oGridControl, _curfieldcolumn, _fieldtype, _columntitle); } - protected int getFieldType() + private int getFieldType() { return m_nFieldType; } @@ -183,7 +183,7 @@ public class DatabaseControl extends Control } return m_nLongMax; } - public void setNumericLimits() + private void setNumericLimits() { try { diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 72306436c1ca..74d2f54a14dd 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -177,7 +177,7 @@ public class FormHandler } } - public void initializeBasicControlValues() + private void initializeBasicControlValues() { Control oLabelControl = new Control(this, SOLABEL, new Point(), new Size()); XDevice xDevice = UnoRuntime.queryInterface(XDevice.class, oLabelControl.xWindowPeer); @@ -192,7 +192,7 @@ public class FormHandler xDrawPage.remove(oTextControl.xShape); } - public ControlData createControlData(int _datatype, int _controltype, String _scontrolservicename, String _gridcolumnname, boolean _bIsTextControl) + private ControlData createControlData(int _datatype, int _controltype, String _scontrolservicename, String _gridcolumnname, boolean _bIsTextControl) { ControlData curControlData = new ControlData(); curControlData.DataType = _datatype; @@ -247,7 +247,7 @@ public class FormHandler } } - public boolean hasFormByName(String _FormName) + private boolean hasFormByName(String _FormName) { xNamedFormContainer = getDocumentForms(); xNamedForms = UnoRuntime.queryInterface(XNameAccess.class, xNamedFormContainer); @@ -305,7 +305,7 @@ public class FormHandler } } - public boolean belongsToForm(Object _oDrawPageElement, String _FormName) + private boolean belongsToForm(Object _oDrawPageElement, String _FormName) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, _oDrawPageElement); if (xServiceInfo.supportsService("com.sun.star.drawing.ControlShape")) @@ -359,7 +359,7 @@ public class FormHandler return insertFormbyName(_FormName, getDocumentForms()); } - public XNameContainer getFormByName(String _sname) + private XNameContainer getFormByName(String _sname) { XNameContainer xNamedForm = null; try diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java index 3d0479cc314a..69051833078e 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.java +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java @@ -182,7 +182,7 @@ public class OfficeDocument return xFrame; } - public static XFrame createNewPreviewFrame(XMultiServiceFactory xMSF, XTerminateListener listener) + private static XFrame createNewPreviewFrame(XMultiServiceFactory xMSF, XTerminateListener listener) { XToolkit xToolkit = null; try diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 1159888fae34..170a32bdd197 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -151,7 +151,7 @@ public class FormConfiguration Helper.setUnoPropertyValue(UnoDialog.getModel(optOnExistingRelation), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bsupportsRelations && (chkcreateSubForm.getState() == 1))); } - public void toggleSteps() + private void toggleSteps() { if (chkcreateSubForm.getState() == 1) { @@ -190,7 +190,7 @@ public class FormConfiguration return PropertyNames.EMPTY_STRING; } - public void onexistingRelationSelection() + private void onexistingRelationSelection() { String scurreferencedTableName = getreferencedTableName(); if (scurreferencedTableName.length() > 0) diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index 583953e37d77..295a5c6879f8 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -266,7 +266,7 @@ public class FormDocument extends TextDocument } } - public ControlForm getControlFormByName(String _sname) + private ControlForm getControlFormByName(String _sname) { for (int i = 0; i < oControlForms.size(); i++) { @@ -539,7 +539,7 @@ public class FormDocument extends TextDocument } } - public void finalizeControls() + private void finalizeControls() { Control[] oLabelControls = getLabelControls(); Control[] oDBControls = getDatabaseControls(); diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index 661b86eed06b..293b6c8c8965 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -220,7 +220,7 @@ public class FormWizard extends DatabaseObjectWizard } } - public void buildSteps() + private void buildSteps() { curDBCommandFieldSelection = new CommandFieldSelection(this, curFormDocument.oMainFormDBMetaData, 92, slblFields, slblSelFields, slblTables, true, 34411); curDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener()); @@ -321,7 +321,7 @@ public class FormWizard extends DatabaseObjectWizard xDialog.endExecute(); } - public void insertFormRelatedSteps() + private void insertFormRelatedSteps() { addRoadmap(); int i = 0; diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 2a8b19a78931..bcb01d7bfea9 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -356,7 +356,7 @@ public class StyleApplier } } - public void applyDBControlProperties(int[] _iStyleColors) + private void applyDBControlProperties(int[] _iStyleColors) { try { diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index b8048a577eae..7abe24f985bc 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -149,7 +149,7 @@ public class QuerySummary extends QueryMetaData } // 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) + private String combinePartString(int _InitResID, String[] _FieldNames, int _AlternativeResID) { if (_FieldNames != null && _FieldNames.length > 0) { @@ -158,7 +158,7 @@ public class QuerySummary extends QueryMetaData return oResource.getResText(_AlternativeResID); } - protected String ArrayFieldsToString(int _InitResID, String[] _FieldNames) + private String ArrayFieldsToString(int _InitResID, String[] _FieldNames) { String sReturn = oResource.getResText(_InitResID); int FieldCount = _FieldNames.length; @@ -173,7 +173,7 @@ public class QuerySummary extends QueryMetaData return (sReturn); } - public String combinePartString(int _InitResID, String[][] _FieldNames, int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags) + private String combinePartString(int _InitResID, String[][] _FieldNames, int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags) { if (_FieldNames != null && _FieldNames.length > 0) { @@ -182,7 +182,7 @@ public class QuerySummary extends QueryMetaData return oResource.getResText(_AlternativeResID); } - public String ArrayFieldsToString(int _InitResID, String[][] _FieldNames, int _BaseStringID, String[] _ReplaceTags) + private String ArrayFieldsToString(int _InitResID, String[][] _FieldNames, int _BaseStringID, String[] _ReplaceTags) { String CurString = PropertyNames.EMPTY_STRING; String sReturn = oResource.getResText(_InitResID); diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 4e9c1ee40a20..008c0510295d 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -139,7 +139,7 @@ public class QueryWizard extends DatabaseObjectWizard return m_createdQuery; } - public void enableRoadmapItems(boolean _bEnabled) + private void enableRoadmapItems(boolean _bEnabled) { try { @@ -190,7 +190,7 @@ public class QueryWizard extends DatabaseObjectWizard } } - public void insertQueryRelatedSteps() + private void insertQueryRelatedSteps() { try { @@ -221,7 +221,7 @@ public class QueryWizard extends DatabaseObjectWizard } } - public void buildSteps() + private void buildSteps() { try { diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 9da1ed770379..09c5f954ca17 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -241,7 +241,7 @@ public class DBColumn replaceValueCellofTable(_bIsLandscape); } - public void insertUserFieldToTableCell(TextFieldHandler oTextFieldHandler) + private void insertUserFieldToTableCell(TextFieldHandler oTextFieldHandler) { XTextCursor xTextCursor = TextDocument.createTextCursor(xNameCell); xTextCursor.gotoStart(false); @@ -293,7 +293,7 @@ public class DBColumn } } - public void modifyCellContent(Object CurGroupValue) + private void modifyCellContent(Object CurGroupValue) { double dblValue = 0; try @@ -345,7 +345,7 @@ public class DBColumn } } // If the parameter CurGroupValue is null the placeholders are inserted - public void replaceValueCellofTable(boolean _bIsLandscape) + private void replaceValueCellofTable(boolean _bIsLandscape) { try { diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index df11132d8371..10e0aa372235 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -64,7 +64,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi CurReportDocument.StopProcess(); } - public void showProgressDisplay(boolean bgetConnection) + private void showProgressDisplay(boolean bgetConnection) { try { @@ -149,7 +149,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi } } - public void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties) + private void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties) { if (CurReportDocument.reconnectToDatabase(_xMSF, _properties)) { diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index d0e2c1ee0a29..d62fe3f2165d 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -65,7 +65,7 @@ public class GroupFieldHandler extends FieldSelection } } - public boolean isGroupField(String _FieldName) + private boolean isGroupField(String _FieldName) { return (JavaTools.FieldInList(CurDBMetaData.GroupFieldNames, _FieldName) != -1); } diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 15f8d4b99b63..599d376a18ed 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -366,7 +366,7 @@ public class ReportLayouter } } - public void clearConstants() + private void clearConstants() { constRangeList.clear(); trTitleconst = null; @@ -385,7 +385,7 @@ public class ReportLayouter te.write(tr); } - public List<XTextRange> searchFillInItems(int type) + private List<XTextRange> searchFillInItems(int type) { try { diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 67036c7437a2..0cd7b9a5b102 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -216,7 +216,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen m_xDocProps.setTitle(_sTitleName); } - public void getReportPageStyles() + private void getReportPageStyles() { try { @@ -260,7 +260,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public boolean loadSectionsfromTemplate(String sTemplateUrl) + private boolean loadSectionsfromTemplate(String sTemplateUrl) { try { @@ -346,7 +346,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void updateTextSections(String[] SelGroupNames) + private void updateTextSections(String[] SelGroupNames) { String TableName; DBColumn OldDBColumn; @@ -364,7 +364,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void replaceFieldValueInGroupTable(DBColumn CurDBColumn, int TableIndex) + private void replaceFieldValueInGroupTable(DBColumn CurDBColumn, int TableIndex) { String TableName = TBLGROUPSECTION + (TableIndex + 1); // Note: for some reason the table might lose its name and has to be renamed therefor @@ -393,7 +393,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void insertColumnstoRecordTable() + private void insertColumnstoRecordTable() { int GroupCount = CurDBMetaData.GroupFieldNames.length; DBColumn CurDBColumn; @@ -478,7 +478,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen DBColumnsVector.remove(iSelItemCount); } - public void removeGroupNamesofRecordTable(int GroupFieldCount) + private void removeGroupNamesofRecordTable(int GroupFieldCount) { int CurFieldCount = DBColumnsVector.size(); if (CurFieldCount > GroupFieldCount) @@ -490,7 +490,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen } } - public void showCommonReportErrorBox(Exception exception) + private void showCommonReportErrorBox(Exception exception) { String SystemContentPath = JavaTools.convertfromURLNotation(ContentTemplatePath); String sMsgCurCommonReportError = JavaTools.replaceSubString(sMsgCommonReportError, SystemContentPath, "%PATH"); @@ -587,7 +587,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen return null; } - public static FieldColumn[] removeFieldColumnByFieldName(String _FieldName, FieldColumn[] _FieldColumns) + private static FieldColumn[] removeFieldColumnByFieldName(String _FieldName, FieldColumn[] _FieldColumns) { try { diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index da5089f5fe4e..1bb3cc93ac0e 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -70,7 +70,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme * We have to remove this!!! * @return */ - ReportTextDocument getDoc() + private ReportTextDocument getDoc() { if (m_aDoc == null) { @@ -142,7 +142,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme sMsgNoConnection = m_resource.getResText(UIConsts.RID_DB_COMMON + 14); } - public void addTextSectionCopies() + private void addTextSectionCopies() { m_aDoc.setLayoutSectionsVisible(false); XTextCursor xTextCursor = ReportTextDocument.createTextCursor(m_aDoc.xTextDocument.getText()); diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index 3798bba8637e..1dc886b437da 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -306,7 +306,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener return bQueryCreated; } - public void buildSteps() + private void buildSteps() { // CurReportDocument.getDoc().xProgressBar.setValue(30); CurDBCommandFieldSelection = new CommandFieldSelection(this, m_reportDocument.getRecordParser(), 100, slblFields, slblSelFields, slblTables, true, 34330); @@ -359,7 +359,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener xDialog.endExecute(); } - public void insertQueryRelatedSteps() + private void insertQueryRelatedSteps() { setRMItemLabels(m_oResource, UIConsts.RID_QUERY + 80); addRoadmap(); @@ -529,7 +529,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener m_reportDocument.getRecordParser().dispose(); } - public boolean getReportResources(boolean bgetProgressResourcesOnly) + private boolean getReportResources(boolean bgetProgressResourcesOnly) { sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_REPORT); if (!bgetProgressResourcesOnly) @@ -561,7 +561,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener return sBlindTextNote; } - public void enableRoadmapItems(boolean _bEnabled) + private void enableRoadmapItems(boolean _bEnabled) { try { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index c7c34c68cb06..0524e42c894c 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -163,7 +163,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter /** * Remove all Groups */ - protected void clearGroups() + private void clearGroups() { final XGroups xGroups = getReportDefinition().getGroups(); while (xGroups.hasElements()) @@ -297,7 +297,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return aUsedStyle; } - protected int getFromPageStyles(String _sStyleName, int _nDefault) + private int getFromPageStyles(String _sStyleName, int _nDefault) { int nValue = _nDefault; final XStyle xStyle = getUsedStyle("PageStyles"); @@ -310,7 +310,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return nValue; } - protected void setToPageStyles(String _sStyleName, Object _aObj) + private void setToPageStyles(String _sStyleName, Object _aObj) { final XStyle xStyle = getUsedStyle("PageStyles"); if (xStyle != null) @@ -381,7 +381,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected int insertGroups() + private int insertGroups() { final XGroups xGroups = getReportDefinition().getGroups(); int lastGroupPosition = -1; @@ -473,7 +473,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected String getTitleFromFieldName(String _sField) + private String getTitleFromFieldName(String _sField) { for (int i = 0; i < m_aFieldNames.length; i++) { @@ -485,7 +485,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return PropertyNames.EMPTY_STRING; } - protected int getTypeFromFieldName(String _sField) + private int getTypeFromFieldName(String _sField) { for (int i = 0; i < m_aFieldNames.length; i++) { @@ -497,7 +497,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return 0; } - protected boolean listContains(String[] _aList, String _aValue) + private boolean listContains(String[] _aList, String _aValue) { for (int i = 0; i < _aList.length; i++) { @@ -516,7 +516,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter * @param _aGetResultFrom * @return */ - protected String[] getNamesWithoutGroupNames(String[] _aList, String[] _aGetResultFrom) + private String[] getNamesWithoutGroupNames(String[] _aList, String[] _aGetResultFrom) { if (_aList == null) { @@ -694,7 +694,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected String convertFromFieldName(String _sName) + private String convertFromFieldName(String _sName) { if (_sName.startsWith("field:[")) { @@ -722,7 +722,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return insertFormattedField(_xSection, _sFormattedfield, _aRect, _nWidth, _aSO, (short) com.sun.star.awt.TextAlign.LEFT); } - protected Rectangle insertFormattedField(XSection _xSection, String _sFormattedfield, Rectangle _aRect, int _nWidth, SectionObject _aSO, short _nAlignment) + private Rectangle insertFormattedField(XSection _xSection, String _sFormattedfield, Rectangle _aRect, int _nWidth, SectionObject _aSO, short _nAlignment) { if (_xSection != null) { @@ -833,7 +833,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } private XMultiServiceFactory m_xMSF; - protected XMultiServiceFactory getMSFofReportDefinition() + private XMultiServiceFactory getMSFofReportDefinition() { if (m_xMSF == null) { @@ -848,12 +848,12 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return insertLine(_xSection, _aRect, _nWidth, _nHeight, 1); } - protected Rectangle insertHorizontalLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight) + private Rectangle insertHorizontalLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight) { return insertLine(_xSection, _aRect, _nWidth, _nHeight, 0); } - protected Rectangle insertLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight, int _nOrientation) + private Rectangle insertLine(XSection _xSection, Rectangle _aRect, int _nWidth, int _nHeight, int _nOrientation) { if (_xSection != null) { @@ -883,7 +883,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected void clearReportHeader() + private void clearReportHeader() { XSection xSection; try @@ -900,7 +900,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertReportHeader() + private void insertReportHeader() { if (getDesignTemplate() != null) { @@ -933,7 +933,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void clearReportFooter() + private void clearReportFooter() { XSection xSection; try @@ -950,7 +950,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertReportFooter() + private void insertReportFooter() { if (getDesignTemplate() != null) { @@ -984,7 +984,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } - protected void clearPageHeader() + private void clearPageHeader() { XSection xSection; try @@ -1001,7 +1001,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void clearPageFooter() + private void clearPageFooter() { XSection xSection; try @@ -1053,7 +1053,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter * @param _aFont * @return width of given text in 1/100mm */ - Size getPreferredSize(String _sText, FontDescriptor _aFont) + private Size getPreferredSize(String _sText, FontDescriptor _aFont) { Size aSizeMM_100TH = new Size(0, 0); try @@ -1100,7 +1100,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return aSizeMM_100TH; } - protected String getTableName() + private String getTableName() { if (m_sTableName != null) { @@ -1109,7 +1109,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return PropertyNames.EMPTY_STRING; } - protected String getUserNameFromConfiguration() + private String getUserNameFromConfiguration() { String sFirstName = PropertyNames.EMPTY_STRING; String sLastName = PropertyNames.EMPTY_STRING; @@ -1202,7 +1202,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertPageHeader() + private void insertPageHeader() { if (getDesignTemplate() != null) { @@ -1303,7 +1303,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter } } - protected void insertPageFooter() + private void insertPageFooter() { if (getDesignTemplate() != null) { @@ -1462,14 +1462,14 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter * @param _sLabel * @return the width in 1/100mm */ - protected int getLabelWidth(String _sLabel) + private int getLabelWidth(String _sLabel) { return getLabelWidth(_sLabel, 0.0f, 0.0f); } private XFixedText m_aFixedTextHelper = null; private HashMap<String, Integer> m_aLabelWidthMap; - protected int getLabelWidth(String _sLabel, FontDescriptor _aFD) + private int getLabelWidth(String _sLabel, FontDescriptor _aFD) { float fCharWeight = 0.0f; float fCharHeight = 0.0f; @@ -1481,7 +1481,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter return getLabelWidth(_sLabel, fCharWeight, fCharHeight); } - protected int getLabelWidth(String _sLabel, float _nCharWeight, float _nCharHeight) + private int getLabelWidth(String _sLabel, float _nCharWeight, float _nCharHeight) { int nWidth = 0; diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index aeb091300444..6bbc1d0a74e3 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -211,7 +211,7 @@ public class FieldFormatter implements XItemListener CurUnoDialog.setFocus("lstfieldnames"); } - public void toggleButtons() + private void toggleButtons() { boolean benableShiftUpButton = false; boolean benableShiftDownButton = false; @@ -355,7 +355,7 @@ public class FieldFormatter implements XItemListener toggleButtons(); } - public String[] shiftArrayItem(String[] _slist, int _oldindex, int _shiftcount) + private String[] shiftArrayItem(String[] _slist, int _oldindex, int _shiftcount) { int newindex = _oldindex + _shiftcount; if ((newindex >= 0) && (newindex < _slist.length)) diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 684055f3ee96..162edb2e3599 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -344,7 +344,7 @@ public class Finalizer return (txtTableName.getText().length() > 0); } - public void setCompletionFlag() + private void setCompletionFlag() { CurUnoDialog.setcompleted(TableWizard.SOFINALPAGE, iscompleted()); } diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index e58b5cc2a549..946b71b9e34f 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -244,7 +244,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener return false; } - public void togglePrimeKeyFields() + private void togglePrimeKeyFields() { boolean bdoEnable = (this.chkcreatePrimaryKey.getState() == 1); Helper.setUnoPropertyValue(UnoDialog.getModel(optAddAutomatically), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoEnable)); diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index bfa079651e25..458f95612844 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -164,7 +164,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X } } - public void initializeCategory(int _iCategory) + private void initializeCategory(int _iCategory) { try { @@ -180,7 +180,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X } } - public void initializeTable(int _iTable) + private void initializeTable(int _iTable) { Helper.setUnoPropertyValue(UnoDialog.getModel(xTableListBox), PropertyNames.SELECTED_ITEMS, new short[] { diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 16e90eb59c3c..9431b821872b 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -238,7 +238,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener } } */ - public void buildSteps() + private void buildSteps() { curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields); curFieldFormatter = new FieldFormatter(this); @@ -250,7 +250,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener enableNavigationButtons(false, false, false); } - public boolean createTable() + private boolean createTable() { boolean bIsSuccessfull = true; boolean bTableCreated = false; @@ -343,7 +343,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener xDialog.endExecute(); } - public void insertFormRelatedSteps() + private void insertFormRelatedSteps() { addRoadmap(); int i = 0; diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index dfc48860a9b3..33739c56b1d5 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -135,7 +135,7 @@ public class TextDocument private String m_identifier; - protected final String getIdentifier() + private final String getIdentifier() { return m_identifier; } @@ -235,7 +235,7 @@ public class TextDocument xProgressBar.setValue(5); } - public XTextDocument loadAsPreview(String sDefaultTemplate, boolean asTemplate) + private XTextDocument loadAsPreview(String sDefaultTemplate, boolean asTemplate) { PropertyValue loadValues[] = new PropertyValue[3]; // open document in the Preview mode diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/wizards/com/sun/star/wizards/text/TextFieldHandler.java index 8d3bf6f91c2e..d3ab23a51651 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.java +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.java @@ -57,7 +57,7 @@ public class TextFieldHandler xTextFieldsSupplier = UnoRuntime.queryInterface(XTextFieldsSupplier.class, xTextDocument); } - public void refreshTextFields() + private void refreshTextFields() { XRefreshable xUp = UnoRuntime.queryInterface(XRefreshable.class, xTextFieldsSupplier.getTextFields()); xUp.refresh(); @@ -111,7 +111,7 @@ public class TextFieldHandler } } - public XPropertySet createUserField(String FieldName, String FieldTitle) throws com.sun.star.uno.Exception + private XPropertySet createUserField(String FieldName, String FieldTitle) throws com.sun.star.uno.Exception { Object oMaster = xMSFDoc.createInstance("com.sun.star.text.FieldMaster.User"); XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, oMaster); diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java index 0500e60f6031..44642f5c4f00 100644 --- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java +++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java @@ -88,7 +88,7 @@ public class TextSectionHandler } } - public void removeTextSection(Object _oTextSection) + private void removeTextSection(Object _oTextSection) { try { @@ -196,7 +196,7 @@ public class TextSectionHandler } } - public void linkSectiontoTemplate(Object oTextSection, String TemplateName, String SectionName) + private void linkSectiontoTemplate(Object oTextSection, String TemplateName, String SectionName) { SectionFileLink oSectionLink = new SectionFileLink(); oSectionLink.FileURL = TemplateName; @@ -236,7 +236,7 @@ public class TextSectionHandler } } - public void insertTextSection(String sectionName, String templateName, XTextCursor position) + private void insertTextSection(String sectionName, String templateName, XTextCursor position) { try { diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index c4b40eacdc1e..ad6c2684b393 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -159,7 +159,7 @@ public class TextTableHandler } } - public void removeTextTable(Object oTextTable) + private void removeTextTable(Object oTextTable) { try { diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 6b78a39d01c2..f6607f47df49 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -232,7 +232,7 @@ public class AggregateComponent extends ControlScroller } } - protected void addRow() + private void addRow() { int fieldcount = super.getTotalFieldCount(); registerControlGroupAtIndex(fieldcount); @@ -254,7 +254,7 @@ public class AggregateComponent extends ControlScroller CurUnoDialog.repaintDialogStep(); } - protected void removeRow() + private void removeRow() { int fieldcount = super.getTotalFieldCount(); if (fieldcount > 0) @@ -274,7 +274,7 @@ public class AggregateComponent extends ControlScroller CurUnoDialog.repaintDialogStep(); } - protected void toggleButtons() + private void toggleButtons() { ControlRow curcontrolrow = null; boolean biscomplete = true; @@ -290,7 +290,7 @@ public class AggregateComponent extends ControlScroller togglefollowingDialogSteps(); } - public void toggleComponent() + private void toggleComponent() { CurDBMetaData.Type = getQueryType(); boolean benableComponent = isAggregateComponentEnabled(); diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 2bb9d607d536..e6c084a6c7cd 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -192,7 +192,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< } } - public void fillUpFieldsListbox() + private void fillUpFieldsListbox() { try { @@ -330,7 +330,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< toggleCommandListBox(bdoenable); } - public void toggleCommandListBox(boolean _bdoenable) + private void toggleCommandListBox(boolean _bdoenable) { Helper.setUnoPropertyValue(UnoDialog.getModel(xTableListBox), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(_bdoenable)); Helper.setUnoPropertyValue(UnoDialog.getModel(xlblTable), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(_bdoenable)); @@ -386,7 +386,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< } } - public void preselectCommand(String _selitem, int _nCommandType, boolean _bReadOnly) + private void preselectCommand(String _selitem, int _nCommandType, boolean _bReadOnly) { if (_selitem.length() > 0) { diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 46ffd48cbdd9..171b642efd6e 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -164,7 +164,7 @@ public abstract class ControlScroller } } - protected void fillupControls(boolean binitialize) + private void fillupControls(boolean binitialize) { for (int a = 0; a < this.nblockincrement; a++) { @@ -183,7 +183,7 @@ public abstract class ControlScroller } } - protected void fillupControls(int guiRow) + private void fillupControls(int guiRow) { PropertyValue[] nameProps = scrollfields.get(guiRow); PropertyValue[] valueProps = scrollfields.get(guiRow + nscrollvalue); @@ -200,7 +200,7 @@ public abstract class ControlScroller } } - protected void setScrollValue(int _nscrollvalue) + private void setScrollValue(int _nscrollvalue) { if (_nscrollvalue >= 0) { @@ -329,7 +329,7 @@ public abstract class ControlScroller } } - protected void scrollRowsInfo() + private void scrollRowsInfo() { int cols = scrollfields.size() > 0 @@ -352,7 +352,7 @@ public abstract class ControlScroller * @return the propertyValue object corresponding to * this control. */ - protected PropertyValue fieldInfo(int guiRow, int column) + private PropertyValue fieldInfo(int guiRow, int column) { if (guiRow + nscrollvalue < scrollfields.size()) { @@ -366,7 +366,7 @@ public abstract class ControlScroller } } - protected PropertyValue fieldInfo(PropertyValue valueProp, PropertyValue nameProp) + private PropertyValue fieldInfo(PropertyValue valueProp, PropertyValue nameProp) { if (CurUnoDialog.getDlgNameAccess().hasByName(nameProp.Name)) { @@ -405,7 +405,7 @@ public abstract class ControlScroller return scrollfields.get(_i); } - protected void setControlData(String controlname, Object newvalue) + private void setControlData(String controlname, Object newvalue) { Object oControlModel = UnoDialog.getModel(CurUnoDialog.xDlgContainer.getControl(controlname)); String propertyname = UnoDialog.getDisplayProperty(oControlModel); @@ -415,7 +415,7 @@ public abstract class ControlScroller } } - protected Object getControlData(String controlname) + private Object getControlData(String controlname) { Object oControlModel = UnoDialog.getModel(CurUnoDialog.xDlgContainer.getControl(controlname)); String propertyname = UnoDialog.getDisplayProperty(oControlModel); diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index fd2ba4bd17c1..cb3576413621 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -585,7 +585,7 @@ public class FieldSelection } } - public void deselectFields(boolean bMoveAll) + private void deselectFields(boolean bMoveAll) { String SearchString; short iOldFieldSelected = xFieldsListBox.getSelectedItemPos(); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 364d304cd410..2feef4716a77 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -181,7 +181,7 @@ public class FilterComponent } } - public static String getIndexNumber(String _sStr) + private static String getIndexNumber(String _sStr) { return _sStr.substring(_sStr.length() - 1, _sStr.length()); } @@ -702,7 +702,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. */ - boolean isConditionComplete() + private boolean isConditionComplete() { try { @@ -746,7 +746,7 @@ public class FilterComponent } } - protected void setCondition(PropertyValue _filtercondition) + private void setCondition(PropertyValue _filtercondition) { try { @@ -816,13 +816,13 @@ public class FilterComponent } } - protected void setFieldNames(String[] _FieldNames) + private void setFieldNames(String[] _FieldNames) { Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTFIELDNAME]), PropertyNames.STRING_ITEM_LIST, _FieldNames); FieldNames = _FieldNames; } - protected boolean isEnabled() + private boolean isEnabled() { return m_bEnabled; } @@ -869,7 +869,7 @@ public class FilterComponent } } - protected String getSelectedFieldName() + private String getSelectedFieldName() { try { @@ -885,7 +885,7 @@ public class FilterComponent // TODO: check if it is really useful to match the indices of the listbox the API constants // =, <>, <, >, <=, >=, like, !like, is null, !is null - protected short getSelectedOperator() + private short getSelectedOperator() { try { @@ -924,7 +924,7 @@ public class FilterComponent } // TODO make a difference between Text and Numbers - protected Object getValue() + private Object getValue() { return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue")); } diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index b6f00a0e3f54..ffec486adc4a 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -194,7 +194,7 @@ public class SortingComponent * sets the controls of a Sorting criterion to readonly or not. * @param _index index of the Sorting criterion */ - public void setReadOnly(int _index, boolean _breadonly) + private void setReadOnly(int _index, boolean _breadonly) { CurUnoDialog.setControlProperty("lstSort" + Integer.toString(_index + 1), PropertyNames.READ_ONLY, Boolean.valueOf(_breadonly)); } diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 4d91bbd3d988..8745987e875b 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -109,7 +109,7 @@ public class UnoDialog implements EventNames return iKey; } - public void createPeerConfiguration() + private void createPeerConfiguration() { m_oPeerConfig = new PeerConfig(this); } @@ -387,7 +387,7 @@ public class UnoDialog implements EventNames return insertEditField("com.sun.star.awt.UnoControlFormattedFieldModel", sName, iControlKey, xTextListener, sProperties, sValues); } - public XTextComponent insertEditField(String ServiceName, String sName, int iControlKey, XTextListener xTextListener, String[] sProperties, Object[] sValues) + private XTextComponent insertEditField(String ServiceName, String sName, int iControlKey, XTextListener xTextListener, String[] sProperties, Object[] sValues) { try { @@ -794,7 +794,7 @@ public class UnoDialog implements EventNames setEnabled(control, enabled ? Boolean.TRUE : Boolean.FALSE); } - public static void setEnabled(Object control, Boolean enabled) + private static void setEnabled(Object control, Boolean enabled) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_ENABLED, enabled); } @@ -803,7 +803,7 @@ public class UnoDialog implements EventNames * @param oControlModel the model of a control * @return the LabelType according to UIConsts.CONTROLTYPE */ - public static int getControlModelType(Object oControlModel) + private static int getControlModelType(Object oControlModel) { XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, oControlModel); if (xServiceInfo.supportsService("com.sun.star.awt.UnoControlFixedTextModel")) @@ -898,7 +898,7 @@ public class UnoDialog implements EventNames * @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) + private static String getDisplayProperty(int itype) { switch (itype) { @@ -988,20 +988,20 @@ public class UnoDialog implements EventNames } } - public static int getRedColorShare(int _nColor) + private static int getRedColorShare(int _nColor) { int nRed = _nColor / 65536; return nRed; } - public static int getGreenColorShare(int _nColor) + private static int getGreenColorShare(int _nColor) { int nRedModulo = _nColor % 65536; int nGreen = nRedModulo / 256; return nGreen; } - public static int getBlueColorShare(int _nColor) + private static int getBlueColorShare(int _nColor) { int nRedModulo = _nColor % 65536; int nGreenModulo = (nRedModulo % 256); diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 25d4766c5e8d..9d0d65badc4a 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -42,7 +42,7 @@ public class UnoDialog2 extends UnoDialog * Override this method to return another listener. * @return */ - protected AbstractListener createListener() + private AbstractListener createListener() { return new CommonListener(); } @@ -105,7 +105,7 @@ public class UnoDialog2 extends UnoDialog return insertCheckBox(sName, itemChanged, this, sPropNames, oPropValues); } - public XComboBox insertComboBox(String sName, String actionPerformed, String itemChanged, String textChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XComboBox insertComboBox(String sName, String actionPerformed, String itemChanged, String textChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { XComboBox xComboBox = (XComboBox) insertControlModel2("com.sun.star.awt.UnoControlComboBoxModel", sName, sPropNames, oPropValues, XComboBox.class); if (actionPerformed != null) @@ -220,7 +220,7 @@ public class UnoDialog2 extends UnoDialog return UnoRuntime.queryInterface(type, xField); } - public XControl insertFileControl(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XControl insertFileControl(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XControl) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlFileControlModel", sPropNames, oPropValues, XControl.class); } @@ -230,7 +230,7 @@ public class UnoDialog2 extends UnoDialog return insertFileControl(sName, sTextChanged, this, sPropNames, oPropValues); } - public XCurrencyField insertCurrencyField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XCurrencyField insertCurrencyField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XCurrencyField) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlCurrencyFieldModel", sPropNames, oPropValues, XCurrencyField.class); } @@ -240,7 +240,7 @@ public class UnoDialog2 extends UnoDialog return insertCurrencyField(sName, sTextChanged, this, sPropNames, oPropValues); } - public XDateField insertDateField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XDateField insertDateField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XDateField) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlDateFieldModel", sPropNames, oPropValues, XDateField.class); } @@ -250,7 +250,7 @@ public class UnoDialog2 extends UnoDialog return insertDateField(sName, sTextChanged, this, sPropNames, oPropValues); } - public XNumericField insertNumericField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XNumericField insertNumericField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XNumericField) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlNumericFieldModel", sPropNames, oPropValues, XNumericField.class); } @@ -260,7 +260,7 @@ public class UnoDialog2 extends UnoDialog return insertNumericField(sName, sTextChanged, this, sPropNames, oPropValues); } - public XTimeField insertTimeField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XTimeField insertTimeField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XTimeField) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlTimeFieldModel", sPropNames, oPropValues, XTimeField.class); } @@ -270,7 +270,7 @@ public class UnoDialog2 extends UnoDialog return insertTimeField(sName, sTextChanged, this, sPropNames, oPropValues); } - public XPatternField insertPatternField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XPatternField insertPatternField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XPatternField) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlPatternFieldModel", sPropNames, oPropValues, XPatternField.class); } @@ -280,7 +280,7 @@ public class UnoDialog2 extends UnoDialog return insertPatternField(sName, sTextChanged, this, sPropNames, oPropValues); } - public XTextComponent insertFormattedField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) + private XTextComponent insertFormattedField(String sName, String sTextChanged, Object eventTarget, String[] sPropNames, Object[] oPropValues) { return (XTextComponent) insertEditField(sName, sTextChanged, eventTarget, "com.sun.star.awt.UnoControlFormattedFieldModel", sPropNames, oPropValues, XTextComponent.class); } @@ -314,7 +314,7 @@ public class UnoDialog2 extends UnoDialog return UnoRuntime.queryInterface(XControl.class, oGroupBox); } - public Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues) + private Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues) { try { @@ -333,7 +333,7 @@ public class UnoDialog2 extends UnoDialog return xDlgContainer.getControl(componentName); } - public Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues, Class<? extends XInterface> type) + private Object insertControlModel2(String serviceName, String componentName, String[] sPropNames, Object[] oPropValues, Class<? extends XInterface> type) { return UnoRuntime.queryInterface(type, insertControlModel2(serviceName, componentName, sPropNames, oPropValues)); } diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index c014dfa605d1..a927ebb39964 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -91,7 +91,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL return oWizardResource; } - public void activate() + private void activate() { try { @@ -366,7 +366,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL abstract protected void enterStep(int nOldStep, int nNewStep); - protected void changeToStep(int nNewStep) + private void changeToStep(int nNewStep) { Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, new Integer(nNewStep)); setCurrentRoadmapItemID((short) (nNewStep)); @@ -522,7 +522,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL enableFinishButton(_bEnableFinish); } - public void enableBackButton(boolean enabled) + private void enableBackButton(boolean enabled) { setControlProperty("btnWizardBack", PropertyNames.PROPERTY_ENABLED, enabled ? Boolean.TRUE : Boolean.FALSE); } @@ -566,7 +566,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } } - public boolean isStepEnabled(int _nStep) + private boolean isStepEnabled(int _nStep) { try { @@ -612,7 +612,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } //TODO discuss with rp - protected int getNextAvailableStep() + private int getNextAvailableStep() { if (isRoadmapComplete()) { @@ -721,7 +721,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL //should be overwritten by extending class } - public void removeTerminateListener() + private void removeTerminateListener() { if (bTerminateListenermustberemoved) { @@ -736,7 +736,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL * if this method was not called before, * perform a cancel. */ - public void cancelWizard_1() + private void cancelWizard_1() { cancelWizard(); removeTerminateListener(); diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java index 132e0cbf22f8..295bcab56e14 100644 --- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java +++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java @@ -65,7 +65,7 @@ public class AbstractListener mHashtable.put(componentName + eventName, mi); } - public MethodInvocation get(String componentName, String eventName) + private MethodInvocation get(String componentName, String eventName) { return mHashtable.get(componentName + eventName); } diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 1ba8db1a13f7..10d7d58fe147 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -71,7 +71,7 @@ public abstract class DataAware { * @param obj the new data object. * @param updateUI if true updateUI() will be called. */ - public void setDataObject(Object obj, boolean updateUI) { + private void setDataObject(Object obj, boolean updateUI) { if (obj != null && !value.isAssignable(obj.getClass())) throw new ClassCastException("can not cast new DataObject to original Class"); @@ -90,7 +90,7 @@ public abstract class DataAware { * another kind of Data is needed. * @param newValue the new value to set to the DataObject. */ - protected void setToData(Object newValue) { + private void setToData(Object newValue) { value.set(newValue,getDataObject()); } @@ -100,7 +100,7 @@ public abstract class DataAware { * the value object. * @return the current value of the data object. */ - protected Object getFromData() { + private Object getFromData() { return value.get(getDataObject()); } @@ -120,7 +120,7 @@ public abstract class DataAware { * updates the UI control according to the * current state of the data object. */ - public void updateUI() { + private void updateUI() { Object data = getFromData(); Object ui = getFromUI(); if (!equals(data, ui)) @@ -164,7 +164,7 @@ public abstract class DataAware { * @param b second object to compare. * @return true if both are null or both are equal. */ - protected boolean equals(Object a, Object b) { + private boolean equals(Object a, Object b) { if (a == null && b == null) return true; if (a == null || b == null) @@ -273,7 +273,7 @@ public abstract class DataAware { * @param obj the object which contains the property. * @return the get method reflection object. */ - protected Method createGetMethod(String propName, Object obj) + private Method createGetMethod(String propName, Object obj) { Method m = null; try @@ -311,7 +311,7 @@ public abstract class DataAware { return null; } - protected Method createSetMethod(String propName, Object obj, Class<?> paramClass) { + private Method createSetMethod(String propName, Object obj, Class<?> paramClass) { Method m = null; try { m = obj.getClass().getMethod("set" + propName, paramClass); diff --git a/wizards/com/sun/star/wizards/ui/event/Task.java b/wizards/com/sun/star/wizards/ui/event/Task.java index b142e2444094..c0440ee5d74c 100644 --- a/wizards/com/sun/star/wizards/ui/event/Task.java +++ b/wizards/com/sun/star/wizards/ui/event/Task.java @@ -58,7 +58,7 @@ public class Task fireTaskStatusChanged(); } - public void advance(boolean success_) + private void advance(boolean success_) { if (success_) { @@ -96,7 +96,7 @@ public class Task listeners.remove(tl); } - protected void fireTaskStatusChanged() + private void fireTaskStatusChanged() { TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STATUS_CHANGED); @@ -106,7 +106,7 @@ public class Task } } - protected void fireTaskStarted() + private void fireTaskStarted() { TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STARTED); @@ -116,7 +116,7 @@ public class Task } } - protected void fireTaskFailed() + private void fireTaskFailed() { TaskEvent te = new TaskEvent(this, TaskEvent.TASK_FAILED); @@ -126,7 +126,7 @@ public class Task } } - protected void fireTaskFinished() + private void fireTaskFinished() { TaskEvent te = new TaskEvent(this, TaskEvent.TASK_FINISHED); @@ -136,7 +136,7 @@ public class Task } } - protected void fireSubtaskNameChanged() + private void fireSubtaskNameChanged() { TaskEvent te = new TaskEvent(this, TaskEvent.SUBTASK_NAME_CHANGED); diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java index 779c02122900..8130fc5c8d76 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java @@ -84,7 +84,7 @@ public class UnoDataAware extends DataAware * @param value * @return */ - protected Boolean getBoolean(Object value) + private Boolean getBoolean(Object value) { if (value == null) { @@ -232,7 +232,7 @@ public class UnoDataAware extends DataAware setEnabled(control, enabled ? Boolean.TRUE : Boolean.FALSE); } - public static void setEnabled(Object control, Boolean enabled) + private static void setEnabled(Object control, Boolean enabled) { Helper.setUnoPropertyValue(getModel(control), PropertyNames.PROPERTY_ENABLED, enabled); } diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 888308d31a47..72771f5b56ab 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -114,7 +114,7 @@ public class XMergeBridge { return( typeReturn ); } - String getFileName(String origName) + private String getFileName(String origName) { String name; if (origName !=null) @@ -300,7 +300,7 @@ public class XMergeBridge { return tmp; } - public String needsMask(String origString){ + private String needsMask(String origString){ if (origString.contains("&")) { origString = origString.replace("&","&"); } @@ -411,7 +411,7 @@ public class XMergeBridge { - public void convert (com.sun.star.io.XInputStream xml,com.sun.star.io.XOutputStream device, + private void convert (com.sun.star.io.XInputStream xml,com.sun.star.io.XOutputStream device, boolean convertFromOffice,String pluginUrl,String FileName,String offMime,String sdMime) throws com.sun.star.uno.RuntimeException, IOException { String jarName = pluginUrl; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java index a67faf2956ed..c3a12fef4cbb 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java @@ -147,7 +147,7 @@ public class Convert implements Cloneable { * <code>addInputStream</code> method to accept input for the next * conversion. */ - public void reset() { + private void reset() { inputCD.reset(); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java index d9b4c46047c6..37480d7cbd61 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java @@ -76,7 +76,7 @@ public class DOMDocument * * @return file extension of the <code>Document</code>. */ - protected String getFileExtension() { + private String getFileExtension() { return fileExt; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java index 18356e0fe1fc..fa6828ae78e6 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java @@ -177,7 +177,7 @@ public final class PalmDB { * @param version The PDB header version. * @param attribute The PDB header attribute. */ - public void setAttributes (int creatorID, int typeID, int version, short attribute) { + private void setAttributes (int creatorID, int typeID, int version, short attribute) { this.creatorID = creatorID; this.typeID = typeID; this.version = version; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index b8527d0332db..4de588c4e545 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -324,7 +324,7 @@ public class ParaStyle extends Style implements Cloneable { * @param attr The attribute to set. * @param value The attribute value to set. */ - public void setAttribute(String attr, String value) { + private void setAttribute(String attr, String value) { for (int i = 0; i < NR_PROPERTIES; i++) { if (attr.equals(attrName[i])) { setAttribute(i, value); @@ -369,7 +369,7 @@ public class ParaStyle extends Style implements Cloneable { * @param attr The attribute index to set. * @param value The attribute value to set. */ - public void setAttribute(int attr, String value) { + private void setAttribute(int attr, String value) { isSet[attr] = true; try { this.value[attr] = (((conversionAlgorithm)algor[attr].newInstance())).I(value); @@ -556,7 +556,7 @@ public class ParaStyle extends Style implements Cloneable { * @param node The <code>Node</code> to add <code>Style</code> * attributes. */ - public void writeAttributes(Element node) { + private void writeAttributes(Element node) { for (int i = 0; i <= TEXT_INDENT; i++) { if (isSet[i]) { double temp = value[i] / 100.0; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index 26b923a4980e..2303bb3bb2c1 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -571,7 +571,7 @@ public class TextStyle extends Style implements Cloneable { * @param node The <code>Node</code> to add <code>Style</code> * attributes. */ - public void writeAttributes(Element node) { + private void writeAttributes(Element node) { if ((mask & BOLD) != 0) if ((values & BOLD) != 0) diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java index 255d8bfaeaa5..bd47df2bb70b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java @@ -152,7 +152,7 @@ public class BookSettings implements OfficeConstants { * @param name xml name of the attribute to set * @param value String value fo the attribute */ - public void addAttribute(String name, String value) { + private void addAttribute(String name, String value) { if(name.equals("ActiveTable")) { activeSheet = value; @@ -167,7 +167,7 @@ public class BookSettings implements OfficeConstants { * * @param root XML Node to read from */ - public void readNode(Node root) { + private void readNode(Node root) { if (root.hasChildNodes()) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index 5f51f618ccbd..e907dd481822 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -373,7 +373,7 @@ public class CellStyle extends Style implements Cloneable { * @param node The <code>Node</code> to add <code>Style</code> * attributes. */ - public void writeAttributes(Element node) { + private void writeAttributes(Element node) { if (fmt.getAlign()==Format.RIGHT_ALIGN) node.setAttribute("fo:text-align", "end"); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java index 8122562932c2..0adb79bd46c2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java @@ -252,7 +252,7 @@ public class ColumnStyle extends Style implements Cloneable { * @param node The <code>Node</code> to add <code>Style</code> * attributes. */ - public void writeAttributes(Element node) { + private void writeAttributes(Element node) { if(colWidth!=0) { String width = TwipsConverter.twips2cm(colWidth) + "cm"; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java index 2dd8eefe10d8..7589143cc57f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java @@ -165,7 +165,7 @@ public class NameDefinition implements OfficeConstants { * * @param root XML Node to read from */ - public void readNode(Node root) { + private void readNode(Node root) { String nodeName = root.getNodeName(); NamedNodeMap cellAtt = root.getAttributes(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java index 1e4ca4cd375d..bae24b5a8d4c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java @@ -252,7 +252,7 @@ public class RowStyle extends Style implements Cloneable { * @param node The <code>Node</code> to add <code>Style</code> * attributes. */ - public void writeAttributes(Element node) { + private void writeAttributes(Element node) { if(rowHeight!=0) { String height = TwipsConverter.twips2cm(rowHeight) + "cm"; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java index 05b078cd2958..11f938bb41f2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java @@ -281,7 +281,7 @@ public class SheetSettings implements OfficeConstants { * @param name xml name of the attribute to set * @param value String value fo the attribute */ - public void addAttribute(String name, String value) { + private void addAttribute(String name, String value) { if(name.equals("CursorPositionX")) { cursorX = Integer.parseInt(value); @@ -312,7 +312,7 @@ public class SheetSettings implements OfficeConstants { * * @param root XML Node to read from */ - public void readNode(Node root) { + private void readNode(Node root) { NamedNodeMap sheetAtt = root.getAttributes(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java index b264b5f9436c..5a27ff05fa71 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java @@ -256,7 +256,7 @@ public abstract class NodeIterator implements Iterator { * * @return true if attributes are equal, false otherwise. */ - protected boolean attributesEqual(Node node1, Node node2) { + private boolean attributesEqual(Node node1, Node node2) { boolean equal = false; String nodeName = node1.getNodeName(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java index cd939b799ddd..c0f486d83476 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java @@ -188,7 +188,7 @@ public class DocumentMerge implements MergeAlgorithm { * @param oldNode <code>Node</code> to append after. * @param newNode <code>Node</code> to append. */ - protected void appendNode(Node oldNode, Node newNode) { + private void appendNode(Node oldNode, Node newNode) { Node clonedNode = XmlUtil.deepClone(oldNode, newNode); Node parent = oldNode.getParentNode(); parent.appendChild(clonedNode); @@ -201,7 +201,7 @@ public class DocumentMerge implements MergeAlgorithm { * @param oldNode <code>Node</code> to insert before. * @param newNode <code>Node</code> to insert. */ - protected void insertNode(Node oldNode, Node newNode) { + private void insertNode(Node oldNode, Node newNode) { Node clonedNode = XmlUtil.deepClone(oldNode, newNode); Node parent = oldNode.getParentNode(); parent.insertBefore(clonedNode, oldNode); @@ -214,7 +214,7 @@ public class DocumentMerge implements MergeAlgorithm { * @param currElem <code>Element</code> to be replaced. * @param newElem <code>Element</code> to replace. */ - protected void replaceElement(Element currElem, Element newElem) { + private void replaceElement(Element currElem, Element newElem) { Node clonedNode = XmlUtil.deepClone(currElem, newElem); Node parent = currElem.getParentNode(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java index adf2be978633..bfa23666ee82 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java @@ -44,7 +44,7 @@ public final class ConverterInfoMgr { * @throws RegistryException If the <code>ConverterInfo</code> * is not valid. */ - public static void addPlugIn(ConverterInfo ci) throws RegistryException { + private static void addPlugIn(ConverterInfo ci) throws RegistryException { // Validate @@ -115,7 +115,7 @@ public final class ConverterInfoMgr { * <code>ConverterInfo</code> objects, an empty * <code>Vector</code> if none exist. */ - public static Iterator<ConverterInfo> getConverterInfoEnumeration() { + private static Iterator<ConverterInfo> getConverterInfoEnumeration() { return (converterInfoList.iterator()); } @@ -151,7 +151,7 @@ public final class ConverterInfoMgr { * @return True if a <code>ConverterInfo</code> object was * removed, false otherwise. */ - public static boolean removeByName(String name) { + private static boolean removeByName(String name) { boolean rc = false; @@ -215,7 +215,7 @@ public final class ConverterInfoMgr { * that can be chained to perform the specified * conversion. */ - public static ConverterInfo[] findConverterInfoChain(String deviceFromMime, String deviceToMime) { + private static ConverterInfo[] findConverterInfoChain(String deviceFromMime, String deviceToMime) { if (deviceFromMime == null || deviceToMime == null) { return null; |