From efd4bfa818e262d7dc219ac3ceb85526fedc732c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 9 Jun 2015 13:30:49 +0200 Subject: java:regulatize the order of 'final' and public/private Make the order be 'public static' or 'private static' Just makes the code nicer to read. Change-Id: I182424bda45a2d68642e5d04c6091d268ace1fe2 Reviewed-on: https://gerrit.libreoffice.org/16202 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- swext/mediawiki/src/com/sun/star/wiki/Helper.java | 10 +++++----- .../src/com/sun/star/wiki/MainThreadDialogExecutor.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'swext') diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 5900e9aa96cd..b2c618d08f03 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -677,7 +677,7 @@ public class Helper } } - static private class HTMLParse extends HTMLEditorKit + private static class HTMLParse extends HTMLEditorKit { @Override @@ -687,12 +687,12 @@ public class Helper } } - static protected HTMLEditorKit.Parser GetHTMLParser() + protected static HTMLEditorKit.Parser GetHTMLParser() { return new HTMLParse().getParser(); } - static private boolean LoginReportsError( String sRespond ) + private static boolean LoginReportsError( String sRespond ) { boolean bResult = true; if ( sRespond != null ) @@ -715,7 +715,7 @@ public class Helper return bResult; } - static private String GetLoginToken( String sLoginPage ) + private static String GetLoginToken( String sLoginPage ) { String sResult = ""; if ( sLoginPage != null && sLoginPage.length() > 0 ) @@ -738,7 +738,7 @@ public class Helper return sResult; } - static protected HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext ) + protected static HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext ) throws java.io.IOException, WikiCancelException { HostConfiguration aHostConfig = null; diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java index 70af8831e505..784bc7774e11 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java +++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java @@ -36,7 +36,7 @@ public class MainThreadDialogExecutor implements XCallback private boolean m_bCalled = false; private boolean m_bClose = false; - static public boolean Show( XComponentContext xContext, WikiDialog aWikiDialog ) + public static boolean Show( XComponentContext xContext, WikiDialog aWikiDialog ) { MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( aWikiDialog ); return GetCallback( xContext, aExecutor ); @@ -44,13 +44,13 @@ public class MainThreadDialogExecutor implements XCallback - static public boolean Execute( XComponentContext xContext, XMessageBox xMessageBox ) + public static boolean Execute( XComponentContext xContext, XMessageBox xMessageBox ) { MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xMessageBox ); return GetCallback( xContext, aExecutor ); } - static public boolean Close( XComponentContext xContext, XDialog xDialog ) + public static boolean Close( XComponentContext xContext, XDialog xDialog ) { MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xDialog ); aExecutor.m_bClose = true; @@ -58,7 +58,7 @@ public class MainThreadDialogExecutor implements XCallback return GetCallback( xContext, aExecutor ); } - static private boolean GetCallback( XComponentContext xContext, MainThreadDialogExecutor aExecutor ) + private static boolean GetCallback( XComponentContext xContext, MainThreadDialogExecutor aExecutor ) { try { -- cgit