You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/10/27 23:41:08 UTC
[openoffice] branch trunk updated: Wiki Publisher: Fixed typos,
removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 86b5339 Wiki Publisher: Fixed typos, removed whitespace
86b5339 is described below
commit 86b5339a424d73974539c93bf58a0af01070cc3a
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Oct 28 00:40:43 2020 +0100
Wiki Publisher: Fixed typos, removed whitespace
---
main/swext/mediawiki/help/wikiformats.xhp | 6 +-
main/swext/mediawiki/makefile.mk | 10 +-
.../sun/star/wiki/MainThreadDialogExecutor.java | 24 ++--
.../src/com/sun/star/wiki/WikiArticle.java | 96 ++++++-------
.../src/com/sun/star/wiki/WikiCancelException.java | 10 +-
.../src/com/sun/star/wiki/WikiEditorImpl.java | 156 ++++++++++-----------
.../sun/star/wiki/WikiOptionsEventHandlerImpl.java | 30 ++--
.../sun/star/wiki/WikiProtocolSocketFactory.java | 20 +--
8 files changed, 176 insertions(+), 176 deletions(-)
diff --git a/main/swext/mediawiki/help/wikiformats.xhp b/main/swext/mediawiki/help/wikiformats.xhp
index 2963ea6..9df7a29 100644
--- a/main/swext/mediawiki/help/wikiformats.xhp
+++ b/main/swext/mediawiki/help/wikiformats.xhp
@@ -53,14 +53,14 @@
<paragraph role="heading" id="hd_id5152745" xml-lang="en-US" level="2" l10n="NEW">Footnotes</paragraph>
<paragraph role="paragraph" id="par_id5238196" xml-lang="en-US" l10n="NEW">Note: The transformation uses the new style of footnotes with <ref> and <references> tags that requires the Cite.php extension to be installed into MediaWiki. If those tags occur as plain text in the transformation result, ask the Wiki administrator to install this extension.</paragraph>
<paragraph role="heading" id="hd_id9405499" xml-lang="en-US" level="2" l10n="NEW">Images</paragraph>
-<paragraph role="paragraph" id="par_id3541673" xml-lang="en-US" l10n="NEW">Images cannot be exported by a transformation producing a single file of Wiki text. However, if the image is already uploaded to the target Wiki domain (e. g. WikiMedia Commons), then the transformation produces a valid image tag that includes the image. Image captions are also supported.</paragraph>
+<paragraph role="paragraph" id="par_id3541673" xml-lang="en-US" l10n="NEW">Images cannot be exported by a transformation producing a single file of Wiki text. However, if the image is already uploaded to the target Wiki domain (e.g. WikiMedia Commons), then the transformation produces a valid image tag that includes the image. Image captions are also supported.</paragraph>
<paragraph role="heading" id="hd_id2162236" xml-lang="en-US" level="2" l10n="NEW">Tables</paragraph>
<paragraph role="paragraph" id="par_id3037202" xml-lang="en-US" l10n="NEW">Simple tables are supported well. Table headers are translated into corresponding Wiki style table headers. However, custom formatting of table borders, column sizes and background colors is ignored.</paragraph>
<paragraph role="heading" id="hd_id2954496" xml-lang="en-US" level="3" l10n="NEW">Joined Cells</paragraph>
-<paragraph role="paragraph" id="par_id8253730" xml-lang="en-US" l10n="NEW">OpenDocument and especially OpenOffice.org represent tables that have joined cells that span rows as tables with nested tables. In contrast, the wiki model of table is to declare column and row spans for such joined cells. </paragraph>
+<paragraph role="paragraph" id="par_id8253730" xml-lang="en-US" l10n="NEW">OpenDocument and especially OpenOffice represent tables that have joined cells that span rows as tables with nested tables. In contrast, the wiki model of table is to declare column and row spans for such joined cells.</paragraph>
<paragraph role="paragraph" id="par_id8163090" xml-lang="en-US" l10n="NEW">If only columns of the same row are joined, the result of the transformation resembles the source document very well.</paragraph>
<paragraph role="heading" id="hd_id425122" xml-lang="en-US" level="3" l10n="NEW">Borders</paragraph>
-<paragraph role="paragraph" id="par_id1831110" xml-lang="en-US" l10n="NEW">Irrespective of custom table styles for border and background, a table is always exported as "<emph>prettytable"</emph>, which renders in the Wiki engine with simple borders and bold header.</paragraph>
+<paragraph role="paragraph" id="par_id1831110" xml-lang="en-US" l10n="NEW">Irrespective of custom table styles for border and background, a table is always exported as <emph>"prettytable"</emph>, which renders in the Wiki engine with simple borders and bold header.</paragraph>
<paragraph role="heading" id="hd_id6255073" xml-lang="en-US" level="2" l10n="NEW">Charset and special characters</paragraph>
<paragraph role="paragraph" id="par_id8216193" xml-lang="en-US" l10n="NEW">The charset of the transformation result is fixed to UTF-8. Depending on your system, this might not be the default charset. This might cause "special characters" to look broken when viewed with default settings. However, you can switch your editor to UTF-8 encoding to fix this. If your editor does not support switching the encoding, you can display the result of the transformation in the Firefox browser and switc [...]
</body>
diff --git a/main/swext/mediawiki/makefile.mk b/main/swext/mediawiki/makefile.mk
index 988e483..362a1e5 100644
--- a/main/swext/mediawiki/makefile.mk
+++ b/main/swext/mediawiki/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -61,5 +61,5 @@ file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" build.xml
.ENDIF
.ELSE
-pesudo:
+pseudo:
.ENDIF
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
index 6b069ba..b77df89 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -46,7 +46,7 @@ public class MainThreadDialogExecutor implements XCallback
MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( aWikiDialog );
return GetCallback( xContext, aExecutor );
}
-
+
static public boolean Execute( XComponentContext xContext, XDialog xDialog )
{
MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xDialog );
@@ -82,7 +82,7 @@ public class MainThreadDialogExecutor implements XCallback
XMultiComponentFactory xFactory = xContext.getServiceManager();
if ( xFactory == null )
throw new com.sun.star.uno.RuntimeException();
-
+
XRequestCallback xRequest = (XRequestCallback)UnoRuntime.queryInterface(
XRequestCallback.class,
xFactory.createInstanceWithContext( "com.sun.star.awt.AsyncCallback", xContext ) );
@@ -110,7 +110,7 @@ public class MainThreadDialogExecutor implements XCallback
return aExecutor.GetResult();
}
-
+
private MainThreadDialogExecutor( WikiDialog aWikiDialog )
{
m_aWikiDialog = aWikiDialog;
@@ -137,7 +137,7 @@ public class MainThreadDialogExecutor implements XCallback
{
return m_bResult;
}
-
+
public void notify( Object aData )
{
if ( m_aWikiDialog != null )
@@ -151,7 +151,7 @@ public class MainThreadDialogExecutor implements XCallback
try
{
m_xDialog.endExecute();
- }
+ }
catch( Exception e )
{
e.printStackTrace();
@@ -162,11 +162,11 @@ public class MainThreadDialogExecutor implements XCallback
else if ( m_xMessageBox != null )
{
int nRes = m_xMessageBox.execute();
- m_bResult = ( nRes == com.sun.star.awt.MessageBoxResults.OK
+ m_bResult = ( nRes == com.sun.star.awt.MessageBoxResults.OK
|| nRes == com.sun.star.awt.MessageBoxResults.YES );
}
-
+
m_bCalled = true;
}
-};
+}
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
index ddcd626..6e4d508 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -33,27 +33,27 @@ import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.*;
-public class WikiArticle
+public class WikiArticle
{
private XComponentContext m_xContext;
-
+
private String m_sEditTime = "";
private String m_sEditToken = "";
-
+
protected String m_sHTMLCode;
private boolean m_bNoArticle = true;
-
+
protected String m_sWikiUser;
protected String m_sWikiPass;
-
+
protected String m_sTitle = "";
-
+
private URI m_aMainURI;
private HostConfiguration m_aHostConfig;
-
-
+
+
/** Creates a new instance of WikiArticle */
- public WikiArticle( XComponentContext xContext, String sTitle, Hashtable wikiSettings, boolean bLogin, WikiPropDialog aPropDialog )
+ public WikiArticle( XComponentContext xContext, String sTitle, Hashtable wikiSettings, boolean bLogin, WikiPropDialog aPropDialog )
throws java.net.MalformedURLException, com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
{
m_xContext = xContext;
@@ -62,7 +62,7 @@ public class WikiArticle
m_sWikiUser = (String) wikiSettings.get("Username");
m_sWikiPass = (String) wikiSettings.get("Password");
m_sTitle = sTitle;
-
+
m_aMainURI = new URI( sMainUrl );
// viewURL = sMainUrl + "index.php?title=" + m_sTitle;
@@ -88,7 +88,7 @@ public class WikiArticle
}
else
throw new WikiCancelException();
-
+
if ( aPropDialog != null )
{
aPropDialog.SetThrobberActive( true );
@@ -106,29 +106,29 @@ public class WikiArticle
// in case of saving the contents should be checked whether they are empty
InitArticleHTML();
- // getArticleWiki();
+ // getArticleWiki();
}
public String GetMainURL()
{
return m_aMainURI.toString();
}
-
+
public String GetTitle()
{
return m_sTitle;
}
-
+
public String GetViewURL()
{
return m_aMainURI.toString() + "index.php?title=" + m_sTitle;
}
-
- private String getArticleWiki()
+
+ private String getArticleWiki()
throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
{
String sWikiCode = null;
-
+
if ( m_aHostConfig != null )
{
URI aURI = new URI( m_aMainURI.toString() + "index.php?title=" + m_sTitle + "&action=edit" );
@@ -140,7 +140,7 @@ public class WikiArticle
String sWebPage = null;
if ( nResultCode == 200 )
sWebPage = aRequest.getResponseBodyAsString();
-
+
aRequest.releaseConnection();
if ( sWebPage != null )
@@ -148,14 +148,14 @@ public class WikiArticle
StringReader r = new StringReader(sWebPage);
HTMLEditorKit.Parser parse = Helper.GetHTMLParser();
EditPageParser callback = new EditPageParser();
-
+
parse.parse(r,callback,true);
m_sEditTime = callback.m_sEditTime;
m_sEditToken = callback.m_sEditToken;
-
+
int iPosStart = callback.m_nWikiArticleStart;
int iPosEnd = callback.m_nWikiArticleEnd;
-
+
if ( iPosStart >= 0 && iPosEnd > 0 )
{
String sArticle = sWebPage.substring(iPosStart, iPosEnd);
@@ -164,11 +164,11 @@ public class WikiArticle
}
}
}
-
+
return sWikiCode;
}
-
- private void InitArticleHTML()
+
+ private void InitArticleHTML()
throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
{
if ( m_aHostConfig != null )
@@ -182,19 +182,19 @@ public class WikiArticle
String sWebPage = null;
if ( nResultCode == 200 )
sWebPage = aRequest.getResponseBodyAsString();
-
+
if ( sWebPage != null )
{
StringReader r = new StringReader(sWebPage);
HTMLEditorKit.Parser parse = Helper.GetHTMLParser();
EditPageParser callback = new EditPageParser();
-
+
parse.parse(r,callback,true);
-
+
int iPosStart = callback.m_nHTMLArticleStart;
int iPosEnd = callback.m_nHTMLArticleEnd;
int nPosNoArt = callback.m_nNoArticleInd;
-
+
if ( iPosStart >= 0 && iPosEnd > 0 )
{
m_sHTMLCode = sWebPage.substring(iPosStart, iPosEnd);
@@ -203,8 +203,8 @@ public class WikiArticle
}
}
}
-
- protected boolean setArticle( String sWikiCode, String sWikiComment, boolean bMinorEdit )
+
+ protected boolean setArticle( String sWikiCode, String sWikiComment, boolean bMinorEdit )
throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
{
boolean bResult = false;
@@ -227,7 +227,7 @@ public class WikiArticle
aPost.addParameter( "wpSave", "Save page" );
aPost.addParameter( "wpEditToken", m_sEditToken );
- if ( bMinorEdit )
+ if ( bMinorEdit )
aPost.addParameter( "wpMinoredit", "1" );
Helper.ExecuteMethod( aPost, m_aHostConfig, aURI, m_xContext, false );
@@ -244,48 +244,48 @@ public class WikiArticle
return bResult;
}
-
- protected boolean Login()
+
+ protected boolean Login()
throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
{
m_aHostConfig = Helper.Login( m_aMainURI, m_sWikiUser, m_sWikiPass, m_xContext );
return ( m_aHostConfig != null );
}
-
- protected void cleanHTML()
+
+ protected void cleanHTML()
{
if ( m_sHTMLCode != null )
{
//Welcome to regex hell ;)
-
+
//strip comments
m_sHTMLCode = m_sHTMLCode.replaceAll("\\<![ \\r\\n\\t]*(--([^\\-]|[\\r\\n]|-[^\\-])*--[ \\r\\n\\t]*)\\>","");
-
+
//strip edit section links
m_sHTMLCode = m_sHTMLCode.replaceAll("\\<div class=\"editsection\".*?\\</div\\>","");
-
+
//strip huge spaces
m_sHTMLCode = m_sHTMLCode.replaceAll("\\<p\\>\\<br /\\>[ \r\n\t]*?\\</p\\>","");
-
+
//strip toc
m_sHTMLCode = m_sHTMLCode.replaceAll("\\<table.*id=\"toc\"(.|[\r\n])*?\\</table\\>","");
//strip jump-to-nav
m_sHTMLCode = m_sHTMLCode.replaceAll("\\<div id=\"jump-to-nav\".*?\\</div\\>","");
-
+
//strip Javascript
m_sHTMLCode = m_sHTMLCode.replaceAll("\\<script(.|[\r\n])*?\\</script\\>","");
}
}
-
-
+
+
protected boolean NotExist()
{
boolean bResult = true;
if ( m_sHTMLCode != null )
bResult = m_bNoArticle;
-
+
return bResult;
}
-
}
+
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
index 46de516..ca42147 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -25,5 +25,5 @@ package com.sun.star.wiki;
class WikiCancelException extends java.lang.Exception
{
-};
+}
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index f161cf1..a2a5b06 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -61,23 +61,23 @@ import javax.net.ssl.SSLException;
public final class WikiEditorImpl extends WeakBase
implements com.sun.star.lang.XServiceInfo, XDispatchProvider, XDispatch, XInitialization
{
-
+
private final XComponentContext m_xContext;
private static final String m_implementationName = WikiEditorImpl.class.getName();
private static final String[] m_serviceNames = {"com.sun.star.wiki.WikiEditor" };
-
- // information needed for component registration
+
+ // information needed for component registration
public static final String[] supportedServiceNames = {"com.sun.star.frame.ProtocolHandler"};
- public static final Class implementationClass = WikiEditorImpl.class;
+ public static final Class implementationClass = WikiEditorImpl.class;
// protocol name that this protocol handler handles
public static final String protocolName = "vnd.com.sun.star.wiki:";
private Map m_statusListeners = new HashMap();
-
+
private XComponent xComp;
private String sTempUrl;
-
+
private XFrame m_xFrame;
private XModel m_xModel;
private Settings m_aSettings;
@@ -91,7 +91,7 @@ public final class WikiEditorImpl extends WeakBase
m_aSettings = Settings.getSettings( m_xContext );
};
- public static XSingleComponentFactory __getComponentFactory( String sImplementationName )
+ public static XSingleComponentFactory __getComponentFactory( String sImplementationName )
{
XSingleComponentFactory xFactory = null;
@@ -100,11 +100,11 @@ public final class WikiEditorImpl extends WeakBase
else if ( sImplementationName.equals( WikiOptionsEventHandlerImpl.m_sImplementationName ) )
xFactory = Factory.createComponentFactory( WikiOptionsEventHandlerImpl.class,
WikiOptionsEventHandlerImpl.m_pServiceNames );
-
+
return xFactory;
}
- public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey )
+ public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey )
{
boolean bResult = Factory.writeRegistryServiceInfo( m_implementationName,
m_serviceNames,
@@ -115,16 +115,16 @@ public final class WikiEditorImpl extends WeakBase
}
// com.sun.star.lang.XServiceInfo:
- public String getImplementationName()
+ public String getImplementationName()
{
return m_implementationName;
}
- public boolean supportsService( String sService )
+ public boolean supportsService( String sService )
{
int len = m_serviceNames.length;
- for( int i=0; i < len; i++ )
+ for( int i=0; i < len; i++ )
{
if ( sService.equals( m_serviceNames[i] ))
return true;
@@ -132,22 +132,22 @@ public final class WikiEditorImpl extends WeakBase
return false;
}
- public String[] getSupportedServiceNames()
+ public String[] getSupportedServiceNames()
{
return m_serviceNames;
}
-
+
private XSelectionSupplier m_sel;
private XController m_ctrl;
private boolean m_bInitialized;
- public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception
- {
- if ( m_bInitialized )
+ public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception
+ {
+ if ( m_bInitialized )
{
//logger.log( Level.SEVERE, "Extension instance was initialized again" );
}
- if ( args.length > 0 )
+ if ( args.length > 0 )
{
m_bInitialized = true;
m_xFrame = ( XFrame )UnoRuntime.queryInterface( XFrame.class, args[0] );
@@ -157,49 +157,49 @@ public final class WikiEditorImpl extends WeakBase
}
}
-
-
+
+
public void dispatch(
- final com.sun.star.util.URL aURL,
- com.sun.star.beans.PropertyValue[] propertyValue )
+ final com.sun.star.util.URL aURL,
+ com.sun.star.beans.PropertyValue[] propertyValue )
{
final com.sun.star.util.URL myURL = aURL;
//logger.log( Level.INFO, "received dispatch request for: "+aURL.Complete );
- if ( aURL.Protocol.compareTo( protocolName ) == 0 )
+ if ( aURL.Protocol.compareTo( protocolName ) == 0 )
{
/*
- synchronized( this )
+ synchronized( this )
{
if( m_bClosing ) return;
else m_bActive = true;
}
**/
-
- try
+
+ try
{
- if ( myURL.Path.compareTo( "send" ) == 0 )
+ if ( myURL.Path.compareTo( "send" ) == 0 )
{
sendArticle();
}
- } catch( java.lang.Throwable t )
+ } catch( java.lang.Throwable t )
{
- //logger.log( Level.WARNING, "exception while handeling dispatch", t );
+ //logger.log( Level.WARNING, "exception while handling dispatch", t );
}
/*
- synchronized( this )
+ synchronized( this )
{
m_bActive = false;
// if we became owner while we were active
// we are responsible for closing the m_xFrame now
if ( m_bOwner && m_xFrame != null )
{
- try
+ try
{
XCloseable xclose = ( XCloseable )UnoRuntime.queryInterface(
XCloseable.class, m_xFrame );
xclose.close( true );
- } catch ( CloseVetoException cve )
+ } catch ( CloseVetoException cve )
{
logger.log( Level.SEVERE, "cannot close owned frame" );
}
@@ -208,92 +208,92 @@ public final class WikiEditorImpl extends WeakBase
}
}
*/
- }
+ }
}
-
+
public com.sun.star.frame.XDispatch queryDispatch(
- com.sun.star.util.URL aURL,
- String str,
- int param )
+ com.sun.star.util.URL aURL,
+ String str,
+ int param )
{
- if ( aURL.Protocol.equals( protocolName ))
+ if ( aURL.Protocol.equals( protocolName ))
{
// by default, we are responsible
return this;
- } else
+ } else
{
return null;
}
}
-
- public XDispatch[] queryDispatches( DispatchDescriptor[] seqDescripts )
+
+ public XDispatch[] queryDispatches( DispatchDescriptor[] seqDescripts )
{
int nCount = seqDescripts.length;
XDispatch[] lDispatcher = new XDispatch[nCount];
for( int i=0; i<nCount; ++i )
- lDispatcher[i] = queryDispatch(
+ lDispatcher[i] = queryDispatch(
seqDescripts[i].FeatureURL,
seqDescripts[i].FrameName,
seqDescripts[i].SearchFlags );
return lDispatcher;
- }
+ }
public void removeStatusListener(
- com.sun.star.frame.XStatusListener xStatusListener,
- com.sun.star.util.URL aURL )
+ com.sun.star.frame.XStatusListener xStatusListener,
+ com.sun.star.util.URL aURL )
{
}
-
+
public void addStatusListener(
- com.sun.star.frame.XStatusListener listener,
- com.sun.star.util.URL url )
+ com.sun.star.frame.XStatusListener listener,
+ com.sun.star.util.URL url )
{
String urlstring = url.Complete;
m_statusListeners.put( urlstring, listener );
- // synchroneous callback required!!!
+ // synchronous callback required!
callStatusListener( urlstring, listener );
}
- public void callStatusListeners()
+ public void callStatusListeners()
{
Set entries = m_statusListeners.entrySet();
Iterator iter = entries.iterator();
- while ( iter.hasNext() )
+ while ( iter.hasNext() )
{
Map.Entry entry = ( Map.Entry ) iter.next();
String uristring = ( String ) entry.getKey();
- XStatusListener listener = ( XStatusListener ) entry.getValue();
- callStatusListener( uristring, listener );
- }
+ XStatusListener listener = ( XStatusListener ) entry.getValue();
+ callStatusListener( uristring, listener );
+ }
}
-
- public void callStatusListener( String uristring, XStatusListener listener )
+
+ public void callStatusListener( String uristring, XStatusListener listener )
{
- try
+ try
{
-
+
URI uri = new URI( uristring );
// check whether any blogs are live...
setListenerState( listener, "command", false );
- } catch ( URISyntaxException ex )
+ } catch ( URISyntaxException ex )
{
ex.printStackTrace();
}
}
-
- private void setListenerState( XStatusListener listener, String urlstring, boolean state )
+
+ private void setListenerState( XStatusListener listener, String urlstring, boolean state )
{
com.sun.star.util.URL url = new com.sun.star.util.URL();
url.Complete = urlstring;
- //listener.statusChanged( new FeatureStateEvent( this, url, "", state, false, null ));
-
+ //listener.statusChanged( new FeatureStateEvent( this, url, "", state, false, null ));
+
}
public void sendArticle()
@@ -301,7 +301,7 @@ public final class WikiEditorImpl extends WeakBase
if ( m_xFrame != null )
{
WikiPropDialog aSendDialog = null;
- try
+ try
{
if ( m_xModel == null )
{
@@ -314,8 +314,8 @@ public final class WikiEditorImpl extends WeakBase
{
// The related Wiki filter must be detected from the typename
String aServiceName = Helper.GetDocServiceName( m_xContext, m_xModel );
- m_aFilterName = Helper.GetFilterName( m_xContext, "MediaWiki", aServiceName );
-
+ m_aFilterName = Helper.GetFilterName( m_xContext, "MediaWiki", aServiceName );
+
if ( m_aFilterName == null || m_aFilterName.length() == 0 )
{
Helper.ShowError( m_xContext,
@@ -347,7 +347,7 @@ public final class WikiEditorImpl extends WeakBase
}
}
}
-
+
public boolean SendArticleImpl( WikiPropDialog aSendDialog, Hashtable aWikiSetting )
{
boolean bResult = false;
@@ -360,7 +360,7 @@ public final class WikiEditorImpl extends WeakBase
{
// TODO: stop progress spinning
WikiArticle aArticle = new WikiArticle( m_xContext, aSendDialog.GetWikiTitle(), aWikiSetting, true, aSendDialog );
-
+
boolean bAllowSending = true;
if ( !aArticle.NotExist() )
{
@@ -406,7 +406,7 @@ public final class WikiEditorImpl extends WeakBase
aDocInfo.put( "Url", aArticle.GetMainURL() );
aDocInfo.put( "CompleteUrl", aArticle.GetMainURL() + aArticle.GetTitle() );
m_aSettings.addWikiDoc( aDocInfo );
- m_aSettings.storeConfiguration();
+ m_aSettings.storeConfiguration();
}
else
{
@@ -421,13 +421,13 @@ public final class WikiEditorImpl extends WeakBase
}
catch( WikiCancelException ec )
{
- // nothing to do, the sending was cancelled
+ // nothing to do, the sending was canceled
}
catch( SSLException essl )
{
if ( Helper.IsConnectionAllowed() )
{
- // report the error only if sending was not cancelled
+ // report the error only if sending was not canceled
Helper.ShowError( m_xContext,
(XWindowPeer)UnoRuntime.queryInterface( XWindowPeer.class, m_xFrame.getContainerWindow() ),
Helper.DLG_SENDTITLE,
@@ -440,7 +440,7 @@ public final class WikiEditorImpl extends WeakBase
{
if ( Helper.IsConnectionAllowed() )
{
- // report the error only if sending was not cancelled
+ // report the error only if sending was not canceled
Helper.ShowError( m_xContext,
(XWindowPeer)UnoRuntime.queryInterface( XWindowPeer.class, m_xFrame.getContainerWindow() ),
Helper.DLG_SENDTITLE,
@@ -465,8 +465,8 @@ public final class WikiEditorImpl extends WeakBase
}
}
}
-
+
return bResult;
}
-
}
+
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 1e2264e..75f21e0 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -59,7 +59,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
private XControlContainer m_xControlContainer;
Settings m_aSettings;
-
+
public WikiOptionsEventHandlerImpl( XComponentContext xContext )
{
m_xContext = xContext;
@@ -92,7 +92,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
}
}
}
@@ -162,7 +162,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
XPropertySet xListProps = GetPropSet("WikiList");
if ( xListProps != null )
{
- try
+ try
{
short[] pSel = (short []) xListProps.getPropertyValue("SelectedItems");
String[] pItems = (String []) GetPropSet("WikiList").getPropertyValue("StringItemList");
@@ -196,16 +196,16 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
}
// com.sun.star.lang.XServiceInfo:
- public String getImplementationName()
+ public String getImplementationName()
{
return m_sImplementationName;
}
- public boolean supportsService( String sService )
+ public boolean supportsService( String sService )
{
int len = m_pServiceNames.length;
- for( int i=0; i < len; i++ )
+ for( int i=0; i < len; i++ )
{
if ( sService.equals( m_pServiceNames[i] ))
return true;
@@ -213,7 +213,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
return false;
}
- public String[] getSupportedServiceNames()
+ public String[] getSupportedServiceNames()
{
return m_pServiceNames;
}
@@ -242,12 +242,12 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
m_xControlContainer = (XControlContainer)UnoRuntime.queryInterface(
XControlContainer.class, m_xDialog );
m_aSettings = Settings.getSettings( m_xContext );
- m_aSettings.loadConfiguration(); // throw away all the noncommited changes
+ m_aSettings.loadConfiguration(); // throw away all the noncommited changes
InitStrings();
}
else if ( m_aSettings != null )
m_aSettings.loadConfiguration(); // throw away all the noncommited changes
-
+
RefreshView();
CheckButtonState();
}
@@ -279,7 +279,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
{
CheckButtonState();
}
-
+
return true;
}
@@ -295,5 +295,5 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
{
return new String[] { sExternalEvent, sAdd, sEdit, sRemove };
}
-};
+}
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
index 059a530..eacf1fa 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -57,7 +57,7 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory
{
new X509TrustManager() {
private X509TrustManager m_aOrgTrustManager;
-
+
private X509TrustManager GetOrgTrustManager()
{
if ( m_aOrgTrustManager == null )
@@ -75,20 +75,20 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory
throw new RuntimeException( "No access to the default trust manager!" );
}
}
-
+
return m_aOrgTrustManager;
}
-
+
public X509Certificate[] getAcceptedIssuers()
{
return GetOrgTrustManager().getAcceptedIssuers();
}
-
+
public void checkClientTrusted(X509Certificate[] certs, String authType) throws CertificateException
{
GetOrgTrustManager().checkClientTrusted( certs, authType );
}
-
+
public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException
{
if ( certs == null || certs.length == 0 )
@@ -160,5 +160,5 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory
{
return WikiProtocolSocketFactory.class.hashCode();
}
-};
+}