summaryrefslogtreecommitdiff
path: root/swext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 12:44:57 +0200
committerNoel Grandin <noel@peralex.com>2014-08-13 08:49:23 +0200
commit68cd011c907d00493bf2bfde531c1e244819596b (patch)
tree0225318c908b00faaa701a19aaf7aa567c3582a0 /swext
parent70f56bc22fe952c75ec714e05e1bb5296491a36a (diff)
java: reduce scope, make some methods private
found by UCDetector Change-Id: Ib1425edde146193a65c242dc159b7e3fbf0e4a2e
Diffstat (limited to 'swext')
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Helper.java16
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Settings.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java2
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java2
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java2
9 files changed, 22 insertions, 22 deletions
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 )
{