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 16:10:03 UTC
[openoffice] branch AOO42X updated: Wiki Publisher: Resized dialog,
fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a98dafe Wiki Publisher: Resized dialog, fixed typos, removed whitespace
a98dafe is described below
commit a98dafeb70c63a117658da0f97953fb4e0bef8d1
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Oct 27 17:06:08 2020 +0100
Wiki Publisher: Resized dialog, fixed typos, removed whitespace
(cherry picked from commit c2e1856c86b8d86a10df3c4d2f4d13edede4568d)
---
main/swext/mediawiki/build.xml | 16 +--
main/swext/mediawiki/dialogs/SendToMediaWiki.xdl | 26 ++--
main/swext/mediawiki/help/component.txt | 2 +-
main/swext/mediawiki/help/wiki.xhp | 11 +-
main/swext/mediawiki/help/wikiformats.xhp | 13 +-
.../src/com/sun/star/wiki/EditPageParser.java | 29 ++--
.../mediawiki/src/com/sun/star/wiki/Helper.java | 154 ++++++++++-----------
.../mediawiki/src/com/sun/star/wiki/Settings.java | 95 ++++++-------
.../src/com/sun/star/wiki/WikiDialog.java | 62 ++++-----
.../com/sun/star/wiki/WikiEditSettingDialog.java | 72 +++++-----
.../src/com/sun/star/wiki/WikiPropDialog.java | 48 +++----
main/swext/mediawiki/src/description.xml | 10 +-
.../org/openoffice/Office/Custom/WikiExtension.xcs | 28 ++--
13 files changed, 282 insertions(+), 284 deletions(-)
diff --git a/main/swext/mediawiki/build.xml b/main/swext/mediawiki/build.xml
index 287c9cf..d9aedea 100644
--- a/main/swext/mediawiki/build.xml
+++ b/main/swext/mediawiki/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,16 +8,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.
- *
+ *
***********************************************************-->
@@ -123,7 +123,7 @@
<target name="uno-package" depends="tmpdir, xcumerge, jar, init">
<delete file="${dist}/${name}.${ext}"/>
- <zip destfile="${dist}/${name}.${ext}">
+ <zip destfile="${dist}/${name}.${ext}">
<fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
<fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
@@ -140,13 +140,13 @@
<target name="development-package" depends="jar, init">
<delete file="${dist}/${target}_develop.zip"/>
- <zip destfile="${dist}/${target}_develop.zip">
+ <zip destfile="${dist}/${target}_develop.zip">
<zipfileset dir="${dist}" includes="${target}.jar" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}" includes="description.xml" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/registry/schema/org/openoffice/Office/Custom" includes="*.xcs" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/registry/data/org/openoffice/Office" includes="ProtocolHandler.xcu,Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office/Custom" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
- <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
+ <zipfileset dir="${out}/misc/${target}/merge/org/openoffice/Office" includes="*.xcu" excludes="**/ProtocolHandler.xcu,**/Paths.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
<!-- FIXME: currently the build xcu files can not be used since the tag containing x-default attribute is thrown away, issue 99378
<fileset dir="${out}/misc/${target}/merge/org/openoffice/TypeDetection" includes="*.xcu" casesensitive="yes" filemode="664" dirmode="775"/>
-->
@@ -196,7 +196,7 @@
<classpath path="${build.classes.dir}"/>
<sourcepath path="${src.dir}"/>
</nbjpdastart>
- <!-- register component in temporaary user installation -->
+ <!-- register component in temporary user installation -->
<echo message="debugging UNO extension package ..."/>
<echo message="wait until preparation is finished."/>
<echo message=" deploying UNO extension package for debugging ..."/>
diff --git a/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl b/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl
index 49986ed..eeb166d 100644
--- a/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl
+++ b/main/swext/mediawiki/dialogs/SendToMediaWiki.xdl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,43 +8,43 @@
* 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.
- *
+ *
***********************************************************-->
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="SendToMediaWiki" dlg:left="62" dlg:top="57" dlg:width="242" dlg:height="164" dlg:closeable="true" dlg:moveable="true" dlg:title="TOREPLACE" dlg:help-url="vnd.com.sun.star.wiki:sendDialog">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="SendToMediaWiki" dlg:left="62" dlg:top="57" dlg:width="260" dlg:height="164" dlg:closeable="true" dlg:moveable="true" dlg:title="TOREPLACE" dlg:help-url="vnd.com.sun.star.wiki:sendDialog">
<dlg:bulletinboard>
<dlg:text dlg:id="Label1" dlg:tab-index="0" dlg:left="5" dlg:top="8" dlg:width="65" dlg:height="10" dlg:value="MediaWiki Server"/>
<dlg:text dlg:id="Label2" dlg:tab-index="3" dlg:left="11" dlg:top="38" dlg:width="59" dlg:height="10" dlg:value="Title"/>
<dlg:text dlg:id="Label3" dlg:tab-index="5" dlg:left="11" dlg:top="57" dlg:width="59" dlg:height="10" dlg:value="Summary"/>
- <dlg:menulist dlg:id="WikiList" dlg:tab-index="1" dlg:left="75" dlg:top="6" dlg:width="116" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.WikiList">
+ <dlg:menulist dlg:id="WikiList" dlg:tab-index="1" dlg:left="75" dlg:top="6" dlg:width="124" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.WikiList">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:WikiListChange" script:language="UNO"/>
</dlg:menulist>
- <dlg:combobox dlg:id="ArticleText" dlg:tab-index="4" dlg:left="75" dlg:top="36" dlg:width="160" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.ArticleText">
+ <dlg:combobox dlg:id="ArticleText" dlg:tab-index="4" dlg:left="75" dlg:top="36" dlg:width="179" dlg:height="14" dlg:spin="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.ArticleText">
<script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.UNO:ArticleTextChange" script:language="UNO"/>
</dlg:combobox>
- <dlg:textfield dlg:id="CommentText" dlg:tab-index="6" dlg:left="75" dlg:top="55" dlg:width="160" dlg:height="48" dlg:multiline="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.CommentText"/>
- <dlg:button dlg:id="AddButton" dlg:tab-index="2" dlg:left="195" dlg:top="6" dlg:width="40" dlg:height="14" dlg:value="Add..." dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.AddButton">
+ <dlg:textfield dlg:id="CommentText" dlg:tab-index="6" dlg:left="75" dlg:top="55" dlg:width="179" dlg:height="48" dlg:multiline="true" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.CommentText"/>
+ <dlg:button dlg:id="AddButton" dlg:tab-index="2" dlg:left="205" dlg:top="6" dlg:width="50" dlg:height="14" dlg:value="Add..." dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.AddButton">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:AddWiki" script:language="UNO"/>
</dlg:button>
<dlg:checkbox dlg:id="MinorCheck" dlg:tab-index="7" dlg:left="75" dlg:top="109" dlg:width="141" dlg:height="10" dlg:value="Minor edit" dlg:checked="false" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.MinorCheck"/>
<dlg:checkbox dlg:id="BrowserCheck" dlg:tab-index="8" dlg:left="75" dlg:top="122" dlg:width="141" dlg:height="10" dlg:value="Show in browser" dlg:checked="false" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.BrowserCheck"/>
- <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="9" dlg:left="-2" dlg:top="138" dlg:width="246" dlg:height="4"/>
- <dlg:button dlg:id="CancelButton" dlg:tab-index="10" dlg:left="187" dlg:top="145" dlg:width="50" dlg:height="14" dlg:button-type="cancel"/>
- <dlg:button dlg:id="SendButton" dlg:tab-index="11" dlg:disabled="true" dlg:left="134" dlg:top="145" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="Send" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.SendButton">
+ <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="9" dlg:left="-2" dlg:top="138" dlg:width="264" dlg:height="4"/>
+ <dlg:button dlg:id="CancelButton" dlg:tab-index="10" dlg:left="205" dlg:top="145" dlg:width="50" dlg:height="14" dlg:button-type="cancel"/>
+ <dlg:button dlg:id="SendButton" dlg:tab-index="11" dlg:disabled="true" dlg:left="152" dlg:top="145" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="Send" dlg:help-url="com.sun.star.wiki.MediaWiki.SendToMediaWiki.SendButton">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:Send" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="HelpButton" dlg:tab-index="12" dlg:left="5" dlg:top="145" dlg:width="50" dlg:height="14" dlg:button-type="help"/>
- <dlg:fixedline dlg:id="FixedLine2" dlg:tab-index="13" dlg:left="5" dlg:top="25" dlg:width="234" dlg:height="6" dlg:value="MediaWiki"/>
+ <dlg:fixedline dlg:id="FixedLine2" dlg:tab-index="13" dlg:left="5" dlg:top="25" dlg:width="250" dlg:height="6" dlg:value="MediaWiki"/>
</dlg:bulletinboard>
</dlg:window>
diff --git a/main/swext/mediawiki/help/component.txt b/main/swext/mediawiki/help/component.txt
index c5ac1de..d723151 100644
--- a/main/swext/mediawiki/help/component.txt
+++ b/main/swext/mediawiki/help/component.txt
@@ -1 +1 @@
-The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.
+The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish new and existing documents transparently with Writer to a wiki page.
diff --git a/main/swext/mediawiki/help/wiki.xhp b/main/swext/mediawiki/help/wiki.xhp
index 0b0503b..8ad91c4 100644
--- a/main/swext/mediawiki/help/wiki.xhp
+++ b/main/swext/mediawiki/help/wiki.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,20 +8,19 @@
* 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.
- *
+ *
***********************************************************-->
-
<helpdocument version="1.0">
<meta>
<topic id="comsunstarwikiMediaWikiwikixml" indexer="include" status="PUBLISH">
@@ -55,7 +54,7 @@
<paragraph role="paragraph" id="par_id9340495" xml-lang="en-US" l10n="NEW">Java Runtime Environment 1.4</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id7387615" xml-lang="en-US" l10n="NEW">A Wiki account on a supported <link href="http://www.mediawiki.org/wiki/MediaWiki">MediaWiki</link> server</paragraph>
+<paragraph role="paragraph" id="par_id7387615" xml-lang="en-US" l10n="NEW">A Wiki account on a supported <link href="https://www.mediawiki.org/wiki/MediaWiki">MediaWiki</link> server</paragraph>
</listitem>
</list>
<paragraph role="heading" id="hd_id8047120" xml-lang="en-US" level="2" l10n="NEW">Installing @WIKIEXTENSIONPRODUCTNAME@</paragraph>
diff --git a/main/swext/mediawiki/help/wikiformats.xhp b/main/swext/mediawiki/help/wikiformats.xhp
index 6c5ce0f..2963ea6 100644
--- a/main/swext/mediawiki/help/wikiformats.xhp
+++ b/main/swext/mediawiki/help/wikiformats.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,20 +8,19 @@
* 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.
- *
+ *
***********************************************************-->
-
<helpdocument version="1.0">
<meta>
<topic id="comsunstarwikiMediaWikiwikiformatsxml" indexer="include" status="PUBLISH">
@@ -34,10 +33,10 @@
</history>
</meta>
<body>
-<bookmark branch="hid/vnd.com.sun.star.wiki:formats" id="bm_id7021088" localize="false"/>
+<bookmark branch="hid/vnd.com.sun.star.wiki:formats" id="bm_id7021088" localize="false"/>
<paragraph role="heading" id="hd_id3743095" xml-lang="en-US" level="1" l10n="NEW">MediaWiki Formats</paragraph>
<paragraph role="paragraph" id="par_id8654133" xml-lang="en-US" l10n="NEW">The following list gives an overview of the text formats that the @WIKIEXTENSIONPRODUCTNAME@ can upload to the Wiki server.</paragraph>
-<paragraph role="paragraph" id="par_id5630664" xml-lang="en-US" l10n="NEW">The OpenDocument format used by Writer and the WikiMedia format are quite different. Only a subset of all features can be transformed from one format to the other.</paragraph>
+<paragraph role="paragraph" id="par_id5630664" xml-lang="en-US" l10n="NEW">The OpenDocument format used by Writer and the MediaWiki format are quite different. Only a subset of all features can be transformed from one format to the other.</paragraph>
<paragraph role="heading" id="hd_id7178868" xml-lang="en-US" level="2" l10n="NEW">Headings</paragraph>
<paragraph role="paragraph" id="par_id508133" xml-lang="en-US" l10n="NEW">Apply a heading paragraph style to the headings in your Writer document. The Wiki will show the heading styles of the same outline level, formatted as defined by the Wiki engine.</paragraph>
<paragraph role="heading" id="hd_id7217627" xml-lang="en-US" level="2" l10n="NEW">Hyperlinks</paragraph>
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/main/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index 55a246c..ccc73ba 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.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.
- *
+ *
*************************************************************/
@@ -28,7 +28,7 @@ import javax.swing.text.MutableAttributeSet;
public class EditPageParser extends HTMLEditorKit.ParserCallback
{
-
+
protected String m_sEditTime = "";
protected String m_sEditToken = "";
protected String m_sLoginToken = "";
@@ -44,12 +44,12 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
protected int m_nHTMLArticleEnd = -1;
protected int m_nNoArticleInd = -1;
protected int m_nErrorInd = -1;
-
+
/** Creates a new instance of WikiHTMLParser */
public EditPageParser()
{
}
-
+
public void handleComment( char[] data,int pos )
{
// insert code to handle comments
@@ -67,8 +67,8 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
{
m_nHTMLArticleStart = pos+6;
m_bHTMLStartFound = false;
- }
- }
+ }
+ }
else if ( t == HTML.Tag.HEAD )
{
m_bInHead = false;
@@ -145,7 +145,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
{
m_nWikiArticleHash = t.hashCode();
m_nWikiArticleStart = pos;
- }
+ }
}
}
else if ( t == HTML.Tag.DIV )
@@ -157,7 +157,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
if ( sId.equalsIgnoreCase( "contentSub" ) )
{
m_bHTMLStartFound = true;
- }
+ }
}
if ( sClass != null )
{
@@ -167,7 +167,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
}
else if ( sClass.equalsIgnoreCase( "noarticletext" ) )
{
- m_nNoArticleInd = pos;
+ m_nNoArticleInd = pos;
}
else if ( sClass.equalsIgnoreCase( "errorbox" ) )
{
@@ -182,8 +182,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
{
m_nErrorInd = pos;
}
- }
+ }
}
-
-
}
+
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 8a9d34d..91c9780 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/Helper.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.
- *
+ *
*************************************************************/
@@ -75,7 +75,7 @@ import org.apache.commons.httpclient.URI;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-public class Helper
+public class Helper
{
public final static int GENERALSEND_ERROR = 0;
public final static int NOWIKIFILTER_ERROR = 1;
@@ -153,7 +153,7 @@ public class Helper
private static final String sHTMLHeader = "<HTML><HEAD><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><TITLE></TITLE></HEAD><BODY>";
private static final String sHTMLFooter = "</BODY></HTML>";
-
+
private static Random m_aRandom;
private static MultiThreadedHttpConnectionManager m_aConnectionManager;
private static HttpClient m_aClient;
@@ -223,7 +223,7 @@ public class Helper
{
return m_bAllowConnection;
}
-
+
synchronized protected static boolean GetShowInBrowserByDefault( XComponentContext xContext )
{
if ( m_bShowInBrowser == null )
@@ -301,7 +301,7 @@ public class Helper
return new Protocol( "https", new WikiProtocolSocketFactory(), ( ( nPort < 0 ) ? 443 : nPort ) );
}
- protected static String GetMainURL( String sWebPage, String sVURL )
+ protected static String GetMainURL( String sWebPage, String sVURL )
{
String sResultURL = "";
try
@@ -309,13 +309,13 @@ public class Helper
StringReader aReader = new StringReader( sWebPage );
HTMLEditorKit.Parser aParser = GetHTMLParser();
EditPageParser aCallback = new EditPageParser();
-
+
aParser.parse( aReader, aCallback, true );
sResultURL = aCallback.m_sMainURL;
- if ( !sResultURL.startsWith( "http" ) )
+ if ( !sResultURL.startsWith( "http" ) )
{
- //if the url is only relative then complete it
+ // if the url is only relative then complete it
URL aURL = new URL( sVURL );
sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + sResultURL;
}
@@ -333,18 +333,18 @@ public class Helper
if ( nIndex >= 0 )
sResultURL = sVURL.substring( 0, nIndex );
}
-
+
return sResultURL;
}
-
+
protected static String GetRedirectURL( String sWebPage, String sURL )
{
- //scrape the HTML source and find the EditURL
+ // scrape the HTML source and find the EditURL
// TODO/LATER: Use parser in future
String sResultURL = "";
int nInd = sWebPage.indexOf( "http-equiv=\"refresh\"" );
- if ( nInd != -1 )
+ if ( nInd != -1 )
{
int nContent = sWebPage.indexOf( "content=", nInd );
if ( nContent > 0 )
@@ -358,28 +358,28 @@ public class Helper
}
}
- try
+ try
{
URL aURL = new URL( sURL );
- if ( !sResultURL.startsWith( aURL.getProtocol() ))
+ if ( !sResultURL.startsWith( aURL.getProtocol() ))
{
- //if the url is only relative then complete it
+ // if the url is only relative then complete it
if ( sResultURL.startsWith( "/" ) )
sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + sResultURL;
else
sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + aURL.getPath() + sResultURL;
}
}
- catch ( MalformedURLException ex )
+ catch ( MalformedURLException ex )
{
ex.printStackTrace();
- }
+ }
}
return sResultURL;
-
+
}
-
+
protected static XInputStream SaveHTMLTemp( XComponentContext xContext, String sArticle )
{
XInputStream xResult = null;
@@ -387,7 +387,7 @@ public class Helper
if ( xContext != null )
{
try
- {
+ {
Object oTempFile = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.io.TempFile", xContext );
XStream xStream = ( XStream ) UnoRuntime.queryInterface( XStream.class, oTempFile );
XSeekable xSeekable = ( XSeekable ) UnoRuntime.queryInterface( XSeekable.class, oTempFile );
@@ -399,10 +399,10 @@ public class Helper
{
String sHTML = sHTMLHeader.concat( sArticle );
sHTML = sHTML.concat( sHTMLFooter );
- xOutputStream.writeBytes( sHTML.getBytes( "UTF-8" ) );
+ xOutputStream.writeBytes( sHTML.getBytes( "UTF-8" ) );
// xOutputStream.closeOutput();
- xSeekable.seek( 0 );
-
+ xSeekable.seek( 0 );
+
xResult = xInputStream;
}
}
@@ -415,12 +415,12 @@ public class Helper
return xResult;
}
-
-
- protected static String CreateTempFile( XComponentContext xContext )
+
+
+ protected static String CreateTempFile( XComponentContext xContext )
{
String sURL = "";
- try
+ try
{
Object oTempFile = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.io.TempFile", xContext );
XPropertySet xPropertySet = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, oTempFile );
@@ -431,27 +431,27 @@ public class Helper
xInputStream.closeInput();
XOutputStream xOutputStream = ( XOutputStream ) UnoRuntime.queryInterface( XOutputStream.class, oTempFile );
xOutputStream.closeOutput();
- } catch ( com.sun.star.uno.Exception ex )
+ } catch ( com.sun.star.uno.Exception ex )
{
ex.printStackTrace();
}
- return sURL;
+ return sURL;
}
-
- protected static String EachLine( String sURL )
+
+ protected static String EachLine( String sURL )
{
String sText = "";
- try
+ try
{
URL aURL = new URL( sURL );
- File aFile = new File( aURL.getFile() );
+ File aFile = new File( aURL.getFile() );
InputStreamReader aInputReader = new InputStreamReader( new FileInputStream( aFile ), "UTF-8" );
BufferedReader aBufReader = new BufferedReader( aInputReader );
StringBuffer aBuf = new StringBuffer();
String sEachLine = aBufReader.readLine();
- while( sEachLine != null )
+ while( sEachLine != null )
{
aBuf.append( sEachLine );
aBuf.append( "\n" );
@@ -459,28 +459,28 @@ public class Helper
sEachLine = aBufReader.readLine();
}
sText = aBuf.toString();
- } catch ( Exception e )
+ } catch ( Exception e )
{
e.printStackTrace();
}
return sText;
}
-
- protected static String GetDocTitle( XModel xDoc )
+
+ protected static String GetDocTitle( XModel xDoc )
{
String sTitle = "";
XDocumentInfoSupplier xDocInfoSup = ( XDocumentInfoSupplier ) UnoRuntime.queryInterface( XDocumentInfoSupplier.class, xDoc );
XPropertySet xPropSet = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, xDocInfoSup.getDocumentInfo() );
- try
+ try
{
sTitle = ( String ) xPropSet.getPropertyValue( "Title" );
- } catch ( Exception ex )
+ } catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
return sTitle;
}
-
+
protected static void SetDocTitle( XModel xDoc, String sTitle )
{
XDocumentInfoSupplier xDocInfoSup = ( XDocumentInfoSupplier ) UnoRuntime.queryInterface( XDocumentInfoSupplier.class, xDoc );
@@ -496,10 +496,10 @@ public class Helper
catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
}
}
- }
+ }
protected static String GetDocServiceName( XComponentContext xContext, XModel xModel )
{
@@ -511,7 +511,7 @@ public class Helper
XMultiComponentFactory xFactory = xContext.getServiceManager();
if ( xFactory == null )
throw new com.sun.star.uno.RuntimeException();
-
+
Object oModuleManager = xFactory.createInstanceWithContext( "com.sun.star.frame.ModuleManager", xContext );
XModuleManager xModuleManager = ( XModuleManager ) UnoRuntime.queryInterface( XModuleManager.class, oModuleManager );
if ( xModuleManager != null )
@@ -525,7 +525,7 @@ public class Helper
return aDocServiceName;
}
-
+
protected static String GetFilterName( XComponentContext xContext, String aTypeName, String aDocServiceName )
{
String aFilterName = "";
@@ -541,7 +541,7 @@ public class Helper
NamedValue[] aRequest = new NamedValue[2];
aRequest[0] = new NamedValue( "Type", aTypeName );
aRequest[1] = new NamedValue( "DocumentService", aDocServiceName );
-
+
XEnumeration xSet = xQuery.createSubSetEnumerationByProperties( aRequest );
if ( xSet != null )
{
@@ -591,7 +591,7 @@ public class Helper
if ( xConfigurationProvider == null )
throw new com.sun.star.uno.RuntimeException();
-
+
return xConfigurationProvider;
}
@@ -606,11 +606,11 @@ public class Helper
aVal.Value = sNodepath;
Object[] aArgs = new Object[1];
aArgs[0] = aVal;
-
+
return GetConfigurationProvider( xContext ).createInstanceWithArguments(
( bWriteAccess ? "com.sun.star.configuration.ConfigurationUpdateAccess"
: "com.sun.star.configuration.ConfigurationAccess" ),
- aArgs );
+ aArgs );
}
protected static XPropertySet GetConfigProps( XComponentContext xContext, String sNodepath )
@@ -619,7 +619,7 @@ public class Helper
XPropertySet xProps = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, GetConfig( xContext, sNodepath, true ) );
if ( xProps == null )
throw new com.sun.star.uno.RuntimeException();
-
+
return xProps;
}
@@ -630,7 +630,7 @@ public class Helper
XNameContainer xContainer = ( XNameContainer ) UnoRuntime.queryInterface( XNameContainer.class, GetConfig( xContext, sNodepath, true ) );
if ( xContainer == null )
throw new com.sun.star.uno.RuntimeException();
-
+
return xContainer;
}
@@ -640,7 +640,7 @@ public class Helper
XNameAccess xNameAccess = ( XNameAccess ) UnoRuntime.queryInterface( XNameAccess.class, GetConfig( xContext, sNodepath, false ) );
if ( xNameAccess == null )
throw new com.sun.star.uno.RuntimeException();
-
+
return xNameAccess;
}
@@ -648,7 +648,7 @@ public class Helper
{
if ( aHostConfig == null || xContext == null )
return;
-
+
try
{
XNameAccess xNameAccess = GetConfigNameAccess( xContext, "org.openoffice.Inet/Settings" );
@@ -675,13 +675,13 @@ public class Helper
String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );
String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );
-
+
int nProxyPort = 80;
Object aPortNo = xNameAccess.getByName( aProxyPortProp );
if ( !AnyConverter.isVoid( aPortNo ) )
nProxyPort = AnyConverter.toInt( aPortNo );
-
+
if ( nProxyPort == -1 )
nProxyPort = 80;
@@ -712,7 +712,7 @@ public class Helper
}
}
}
-
+
protected static void ExecuteMethod( HttpMethodBase aMethod, HostConfiguration aHostConfig, URI aURI, XComponentContext xContext, boolean bSetHost )
throws WikiCancelException, IOException, SSLException
{
@@ -746,7 +746,7 @@ public class Helper
static private class HTMLParse extends HTMLEditorKit
{
- public HTMLEditorKit.Parser getParser()
+ public HTMLEditorKit.Parser getParser()
{
return super.getParser();
}
@@ -756,7 +756,7 @@ public class Helper
{
return new HTMLParse().getParser();
}
-
+
static protected boolean LoginReportsError( String sRespond )
{
boolean bResult = true;
@@ -767,7 +767,7 @@ public class Helper
StringReader aReader = new StringReader( sRespond );
HTMLEditorKit.Parser aParser = GetHTMLParser();
EditPageParser aCallback = new EditPageParser();
-
+
aParser.parse( aReader, aCallback, true );
bResult = ( aCallback.m_nErrorInd >= 0 );
}
@@ -776,7 +776,7 @@ public class Helper
e.printStackTrace();
}
}
-
+
return bResult;
}
@@ -790,7 +790,7 @@ public class Helper
StringReader aReader = new StringReader( sLoginPage );
HTMLEditorKit.Parser aParser = Helper.GetHTMLParser();
EditPageParser aCallbacks = new EditPageParser();
-
+
aParser.parse( aReader, aCallbacks, true );
sResult = aCallbacks.m_sLoginToken;
}
@@ -803,7 +803,7 @@ public class Helper
return sResult;
}
- static protected HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext )
+ static protected HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext )
throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
{
HostConfiguration aHostConfig = null;
@@ -837,7 +837,7 @@ public class Helper
aPost.addParameter( "wpPassword", sWikiPass );
if ( sLoginToken.length() > 0 )
aPost.addParameter( "wpLoginToken", sLoginToken );
-
+
String[][] pArgs = GetSpecialArgs( xContext, aMainURL.getHost() );
if ( pArgs != null )
for ( int nArgInd = 0; nArgInd < pArgs.length; nArgInd++ )
@@ -845,7 +845,7 @@ public class Helper
aPost.addParameter( pArgs[nArgInd][0], pArgs[nArgInd][1] );
ExecuteMethod( aPost, aNewHostConfig, aPostURI, xContext, false );
-
+
nResultCode = aPost.getStatusCode();
while( nResultCode >= 301 && nResultCode <= 303 || nResultCode == 307 )
@@ -860,14 +860,14 @@ public class Helper
nResultCode = aPost.getStatusCode();
}
-
+
if ( nResultCode == 200 )
{
String sResult = aPost.getResponseBodyAsString();
if ( !LoginReportsError( sResult ) )
aHostConfig = aNewHostConfig;
}
-
+
aPost.releaseConnection();
}
}
@@ -879,7 +879,7 @@ public class Helper
{
XControl xResult = null;
XControlContainer xControlCont = (XControlContainer) UnoRuntime.queryInterface( XControlContainer.class, xDialog );
-
+
if ( xControlCont != null )
{
Object oControl = xControlCont.getControl( aControlName );
@@ -894,7 +894,7 @@ public class Helper
XControl xControl = GetControlFromDialog( xDialog, aControlName );
if ( xControl != null )
return ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, xControl.getModel() );
-
+
return null;
}
@@ -912,7 +912,7 @@ public class Helper
{
e.printStackTrace();
}
- }
+ }
}
protected static String[] GetPasswordsForURLAndUser( XComponentContext xContext, String sURL, String sUserName )
@@ -962,7 +962,7 @@ public class Helper
xPeer = xControl.getPeer();
ShowError( xContext, xPeer, nTitleID, nErrorID, sArg, bQuery );
}
-
+
protected static boolean ShowError( XComponentContext xContext, XWindowPeer xParentPeer, int nTitleID, int nErrorID, String sArg, boolean bQuery )
{
boolean bResult = false;
@@ -973,7 +973,7 @@ public class Helper
String sError = null;
String sTitle = "";
-
+
try
{
sError = GetLocalizedString( xContext, nErrorID );
@@ -1001,7 +1001,7 @@ public class Helper
xMBFactory = (XMessageBoxFactory)UnoRuntime.queryInterface(
XMessageBoxFactory.class,
xFactory.createInstanceWithContext( "com.sun.star.awt.Toolkit", xContext ) );
-
+
if ( xMBFactory != null )
{
if ( bQuery )
@@ -1086,7 +1086,7 @@ public class Helper
XNameAccess xArgument = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class, xArgs.getByName( pNames[nInd] ) );
if ( xArgument == null )
throw new com.sun.star.uno.RuntimeException();
-
+
pResult[nInd][0] = pNames[nInd];
pResult[nInd][1] = AnyConverter.toString( xArgument.getByName( "Value" ) );
}
@@ -1123,7 +1123,7 @@ public class Helper
e.printStackTrace();
}
}
-
+
return false;
}
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/main/swext/mediawiki/src/com/sun/star/wiki/Settings.java
index 903972f..7739376 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/Settings.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/Settings.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.
- *
+ *
*************************************************************/
@@ -38,25 +38,25 @@ import java.util.Vector;
public class Settings
{
-
+
private XComponentContext m_xContext;
private int lastUsedWikiServer = 0;
-
-
+
+
/* Singelton */
private static Settings m_instance;
-
-
+
+
private Vector m_WikiConnections = new Vector();
private Vector m_aWikiDocs = new Vector();
-
+
private Settings( XComponentContext ctx )
{
m_xContext=ctx;
loadConfiguration();
}
-
-
+
+
public static synchronized Settings getSettings( XComponentContext ctx )
{
if ( m_instance == null )
@@ -64,19 +64,19 @@ public class Settings
// m_instance.loadSettings();
return m_instance;
}
-
-
+
+
public void addWikiCon ( Hashtable wikiCon )
{
m_WikiConnections.add( wikiCon );
}
-
-
+
+
public Vector getWikiCons()
{
return m_WikiConnections;
}
-
+
public String getWikiConUrlByNumber( int num )
{
String url = "";
@@ -87,8 +87,8 @@ public class Settings
}
return url;
}
-
-
+
+
public void addWikiDoc ( Hashtable aWikiDoc )
{
String sURL = ( String ) aWikiDoc.get( "CompleteUrl" );
@@ -107,13 +107,13 @@ public class Settings
m_aWikiDocs.add( aWikiDoc );
}
-
-
+
+
public Vector getWikiDocs()
{
return m_aWikiDocs;
}
-
+
public Object[] getWikiDocList( int serverid, int num )
{
String wikiserverurl = getWikiConUrlByNumber( serverid );
@@ -130,17 +130,17 @@ public class Settings
}
return theDocs.toArray( docs );
}
-
+
public int getLastUsedWikiServer()
{
return lastUsedWikiServer;
}
-
+
public void setLastUsedWikiServer( int l )
{
lastUsedWikiServer = l;
}
-
+
public String[] getWikiURLs()
{
String [] WikiList = new String [m_WikiConnections.size()];
@@ -151,8 +151,8 @@ public class Settings
}
return WikiList;
}
-
-
+
+
public Hashtable getSettingByUrl( String sUrl )
{
Hashtable ht = null;
@@ -184,7 +184,7 @@ public class Settings
}
return ht;
}
-
+
public Hashtable getDocByCompleteUrl( String curl )
{
Hashtable ht = null;
@@ -199,8 +199,8 @@ public class Settings
}
return ht;
}
-
-
+
+
public void removeSettingByUrl( String sUrl )
{
Hashtable ht = null;
@@ -214,8 +214,8 @@ public class Settings
}
}
}
-
-
+
+
public void storeConfiguration()
{
try
@@ -224,10 +224,10 @@ public class Settings
XNameContainer xContainer = Helper.GetConfigNameContainer( m_xContext, "org.openoffice.Office.Custom.WikiExtension/ConnectionList" );
String[] pNames = xContainer.getElementNames();
for( int i=0; i<pNames.length; i++ )
- {
+ {
xContainer.removeByName( pNames[i] );
}
-
+
// store all connections
XSingleServiceFactory xConnectionFactory = ( XSingleServiceFactory ) UnoRuntime.queryInterface( XSingleServiceFactory.class, xContainer );
for ( int i=0; i< m_WikiConnections.size(); i++ )
@@ -235,21 +235,21 @@ public class Settings
Object oNewConnection = xConnectionFactory.createInstance();
Hashtable ht = ( Hashtable ) m_WikiConnections.get( i );
XNameReplace xNewConn = ( XNameReplace ) UnoRuntime.queryInterface( XNameReplace.class, oNewConnection );
-
+
if ( xNewConn != null )
xNewConn.replaceByName( "UserName", ht.get( "Username" ) );
-
+
xContainer.insertByName( (String)ht.get( "Url" ), xNewConn );
}
// commit changes
XChangesBatch xBatch = ( XChangesBatch ) UnoRuntime.queryInterface( XChangesBatch.class, xContainer );
xBatch.commitChanges();
-
+
// remove stored connection information
XNameContainer xContainer2 = Helper.GetConfigNameContainer( m_xContext, "org.openoffice.Office.Custom.WikiExtension/RecentDocs" );
String[] pNames2 = xContainer2.getElementNames();
for( int i=0; i<pNames2.length; i++ )
- {
+ {
xContainer2.removeByName( pNames2[i] );
}
// store all Docs
@@ -257,30 +257,30 @@ public class Settings
for ( int i=0; i< m_aWikiDocs.size(); i++ )
{
Hashtable ht = ( Hashtable ) m_aWikiDocs.get( i );
-
+
Object oNewDoc = xDocListFactory.createInstance();
XNameReplace xNewDoc = ( XNameReplace ) UnoRuntime.queryInterface( XNameReplace.class, oNewDoc );
-
+
Enumeration e = ht.keys();
while ( e.hasMoreElements() )
{
String key = ( String ) e.nextElement();
xNewDoc.replaceByName( key, ht.get( key ) );
}
-
+
xContainer2.insertByName( "d" + i, xNewDoc );
}
// commit changes
XChangesBatch xBatch2 = ( XChangesBatch ) UnoRuntime.queryInterface( XChangesBatch.class, xContainer2 );
xBatch2.commitChanges();
-
+
}
catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
}
-
+
public void loadConfiguration()
{
m_WikiConnections.clear();
@@ -289,7 +289,7 @@ public class Settings
// get configuration service
// connect to configmanager
XNameAccess xAccess = Helper.GetConfigNameAccess( m_xContext, "org.openoffice.Office.Custom.WikiExtension" );
-
+
if ( xAccess != null )
{
Object oList = xAccess.getByName( "ConnectionList" );
@@ -316,7 +316,7 @@ public class Settings
{
e.printStackTrace();
}
-
+
addWikiCon( ht );
}
@@ -338,6 +338,7 @@ public class Settings
catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
}
}
+
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
index 0e1930f..122e591 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.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.
- *
+ *
*************************************************************/
@@ -42,14 +42,14 @@ import com.sun.star.lang.EventObject;
import com.sun.star.lang.XMultiServiceFactory;
public class WikiDialog implements XDialogEventHandler, XTopWindowListener
-{
+{
XComponentContext m_xContext;
XControlContainer m_xControlContainer;
XDialog m_xDialog;
String[] m_aMethods;
boolean m_bAction = false;
Settings m_aSettings;
-
+
protected Thread m_aThread;
protected boolean m_bThreadFinished = false;
@@ -65,7 +65,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
Object obj;
obj = xMCF.createInstanceWithContext("com.sun.star.awt.DialogProvider2", m_xContext );
XDialogProvider2 xDialogProvider = (XDialogProvider2) UnoRuntime.queryInterface( XDialogProvider2.class, obj );
-
+
m_xDialog = xDialogProvider.createDialogWithHandler( DialogURL, this );
m_xControlContainer = (XControlContainer)UnoRuntime.queryInterface( XControlContainer.class, m_xDialog );
XTopWindow xTopWindow = (XTopWindow)UnoRuntime.queryInterface( XTopWindow.class, m_xDialog );
@@ -77,7 +77,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
ex.printStackTrace();
}
}
-
+
public synchronized void ThreadStop( boolean bSelf )
{
if ( bSelf || m_aThread != null && !m_bThreadFinished )
@@ -96,38 +96,38 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
m_bThreadFinished = true;
}
- protected void setMethods (String [] Methods)
+ protected void setMethods (String [] Methods)
{
this.m_aMethods = Methods;
}
-
-
- public boolean show( )
+
+
+ public boolean show( )
{
m_bThreadFinished = false;
if( m_xDialog != null ) m_xDialog.execute();
return m_bAction;
}
-
-
- public String[] getSupportedMethodNames()
+
+
+ public String[] getSupportedMethodNames()
{
return m_aMethods;
}
-
-
+
+
public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
{
return true;
}
-
+
public void SetTitle( String sTitle )
throws Exception
{
SetTitle( m_xDialog, sTitle );
}
-
+
public static void SetTitle( XDialog xDialog, String sTitle )
throws Exception
{
@@ -142,7 +142,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
}
}
}
-
+
protected XPropertySet GetPropSet(String sControl)
{
return GetPropSet( m_xControlContainer, sControl );
@@ -160,7 +160,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
if ( xPS == null )
throw new com.sun.star.uno.RuntimeException();
-
+
return xPS;
}
@@ -174,7 +174,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
{
Object oDialogProvider = xContext.getServiceManager().createInstanceWithContext("com.sun.star.awt.DialogProvider2", xContext );
XDialogProvider2 xDialogProvider = (XDialogProvider2) UnoRuntime.queryInterface( XDialogProvider2.class, oDialogProvider );
-
+
if ( xDialogProvider != null )
xResult = xDialogProvider.createDialog( sURL );
@@ -193,11 +193,11 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
{
ex.printStackTrace();
}
- }
+ }
return xResult;
}
-
+
protected void InsertThrobber( int X, int Y, int Width, int Height )
{
try
@@ -214,11 +214,11 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
XPropertySet xThrobberProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel );
if ( xThrobberProps != null )
{
- xThrobberProps.setPropertyValue( "Name", "WikiThrobber" );
+ xThrobberProps.setPropertyValue( "Name", "WikiThrobber" );
xThrobberProps.setPropertyValue( "PositionX", new Integer( X ) );
xThrobberProps.setPropertyValue( "PositionY", new Integer( Y ) );
- xThrobberProps.setPropertyValue( "Height", new Integer( Width ) );
- xThrobberProps.setPropertyValue( "Width", new Integer( Height ) );
+ xThrobberProps.setPropertyValue( "Width", new Integer( Width ) );
+ xThrobberProps.setPropertyValue( "Height", new Integer( Height ) );
XNameContainer xDialogContainer = (XNameContainer)UnoRuntime.queryInterface( XNameContainer.class, xDialogModel );
xDialogContainer.insertByName( "WikiThrobber", xThrobberModel );
@@ -277,7 +277,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
if ( m_xControlContainer != null )
{
try
- {
+ {
XWindow xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, m_xControlContainer.getControl( aControl ) );
if ( xWindow != null )
xWindow.setFocus();
@@ -286,14 +286,14 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
{
e.printStackTrace();
}
- }
+ }
}
public void DisposeDialog()
{
Helper.Dispose( m_xDialog );
}
-
+
public void windowOpened( EventObject e )
{}
@@ -314,7 +314,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
public void windowDeactivated( EventObject e )
{}
-
+
public void disposing( EventObject e )
{}
}
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index c728787..5b52862 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.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.
- *
+ *
*************************************************************/
@@ -35,18 +35,18 @@ import javax.net.ssl.SSLException;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.*;
-public class WikiEditSettingDialog extends WikiDialog
+public class WikiEditSettingDialog extends WikiDialog
{
-
+
private final String sOKMethod = "OK";
- String[] Methods =
+ String[] Methods =
{sOKMethod };
private Hashtable setting;
private boolean addMode;
private boolean m_bAllowURLChange = true;
- public WikiEditSettingDialog( XComponentContext xContext, String DialogURL )
+ public WikiEditSettingDialog( XComponentContext xContext, String DialogURL )
{
super( xContext, DialogURL );
super.setMethods( Methods );
@@ -55,21 +55,21 @@ public class WikiEditSettingDialog extends WikiDialog
InsertThrobber( 184, 20, 10, 10 );
InitStrings( xContext );
- InitSaveCheckbox( xContext, false );
+ InitSaveCheckbox( xContext, false );
}
-
- public WikiEditSettingDialog( XComponentContext xContext, String DialogURL, Hashtable ht, boolean bAllowURLChange )
+
+ public WikiEditSettingDialog( XComponentContext xContext, String DialogURL, Hashtable ht, boolean bAllowURLChange )
{
super( xContext, DialogURL );
super.setMethods( Methods );
setting = ht;
-
+
boolean bInitSaveCheckBox = false;
-
- try
+
+ try
{
XPropertySet xUrlField = GetPropSet( "UrlField" );
-
+
xUrlField.setPropertyValue( "Text", ht.get( "Url" ) );
GetPropSet( "UsernameField" ).setPropertyValue( "Text", ht.get( "Username" ) );
@@ -83,20 +83,20 @@ public class WikiEditSettingDialog extends WikiDialog
// the password should be entered by the user or the Cancel should be pressed
// GetPropSet( "PasswordField" ).setPropertyValue( "Text", ht.get( "Password" ));
}
- catch ( Exception ex )
+ catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
- addMode = false;
+ addMode = false;
m_bAllowURLChange = bAllowURLChange;
-
+
InsertThrobber( 184, 20, 10, 10 );
InitStrings( xContext );
InitSaveCheckbox( xContext, bInitSaveCheckBox );
}
- public boolean show( )
+ public boolean show( )
{
SetThrobberVisible( false );
EnableControls( true );
@@ -122,7 +122,7 @@ public class WikiEditSettingDialog extends WikiDialog
{
e.printStackTrace();
}
-
+
return bResult;
}
@@ -131,7 +131,7 @@ public class WikiEditSettingDialog extends WikiDialog
if ( !bEnable )
SetFocusTo( "CancelButton" );
- try
+ try
{
GetPropSet( "UsernameField" ).setPropertyValue( "Enabled", new Boolean( bEnable ) );
GetPropSet( "PasswordField" ).setPropertyValue( "Enabled", new Boolean( bEnable ) );
@@ -153,10 +153,10 @@ public class WikiEditSettingDialog extends WikiDialog
GetPropSet( "SaveBox" ).setPropertyValue( "Enabled", Boolean.FALSE );
}
}
- catch ( Exception ex )
+ catch ( Exception ex )
{
ex.printStackTrace();
- }
+ }
}
private void InitStrings( XComponentContext xContext )
@@ -189,9 +189,9 @@ public class WikiEditSettingDialog extends WikiDialog
catch( Exception e )
{
e.printStackTrace();
- }
+ }
}
-
+
public void DoLogin( XDialog xDialog )
{
String sRedirectURL = "";
@@ -230,12 +230,12 @@ public class WikiEditSettingDialog extends WikiDialog
sRedirectURL = aRequest.getResponseHeader( "Location" ).getValue();
aRequest.releaseConnection();
-
+
if ( sWebPage != null && sWebPage.length() > 0 )
{
//the URL is valid
String sMainURL = Helper.GetMainURL( sWebPage, sURL );
-
+
if ( sMainURL.equals( "" ) )
{
// TODO:
@@ -280,7 +280,7 @@ public class WikiEditSettingDialog extends WikiDialog
Settings.getSettings( m_xContext ).addWikiCon( setting );
Settings.getSettings( m_xContext ).storeConfiguration();
}
-
+
m_bAction = true;
}
}
@@ -289,7 +289,7 @@ public class WikiEditSettingDialog extends WikiDialog
{
if ( sURL.length() > 0 && !sURL.endsWith( "index.php" ) && bAllowIndex )
{
- // the used MainURL is not alwais directly accessible
+ // the used MainURL is not always directly accessible
// add the suffix as workaround, but only once
sRedirectURL = sURL + "/index.php";
bAllowIndex = false;
@@ -336,7 +336,7 @@ public class WikiEditSettingDialog extends WikiDialog
}
essl.printStackTrace();
}
- catch ( Exception ex )
+ catch ( Exception ex )
{
if ( Helper.IsConnectionAllowed() )
{
@@ -348,9 +348,9 @@ public class WikiEditSettingDialog extends WikiDialog
false );
}
ex.printStackTrace();
- }
+ }
}
-
+
public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
{
if ( MethodName.equals( sOKMethod ) )
@@ -364,7 +364,7 @@ public class WikiEditSettingDialog extends WikiDialog
final XDialog xDialogForThread = xDialog;
final XComponentContext xContext = m_xContext;
final WikiEditSettingDialog aThis = this;
-
+
// the thread name is used to allow the error dialogs
m_bThreadFinished = false;
m_aThread = new Thread( "com.sun.star.thread.WikiEditorSendingThread" )
@@ -382,7 +382,7 @@ public class WikiEditSettingDialog extends WikiDialog
aThis.SetThrobberVisible( false );
ThreadStop( true );
-
+
if ( m_bAction )
MainThreadDialogExecutor.Close( xContext, xDialogForThread );
}
@@ -415,7 +415,7 @@ public class WikiEditSettingDialog extends WikiDialog
return false;
}
-
+
public void windowClosed( EventObject e )
{
ThreadStop( false );
diff --git a/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index b081195..f05ff2a 100644
--- a/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.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.
- *
+ *
*************************************************************/
@@ -39,21 +39,21 @@ import com.sun.star.uno.XComponentContext;
import java.util.Hashtable;
public class WikiPropDialog extends WikiDialog{
-
+
WikiEditorImpl m_aWikiEditor;
private final String sSendMethod = "Send";
private final String sWikiListMethod = "WikiListChange";
private final String sArticleTextMethod = "ArticleTextChange";
private final String sAddWikiMethod = "AddWiki";
-
+
String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod};
-
+
private String m_sWikiTitle = "";
protected String m_sWikiEngineURL = "";
protected String m_sWikiComment = "";
protected boolean m_bWikiMinorEdit = false;
-
+
/** Creates a new instance of WikiPropDialog */
public WikiPropDialog(XComponentContext xContext, String DialogURL, WikiEditorImpl aWikiEditorForThrobber )
{
@@ -62,7 +62,7 @@ public class WikiPropDialog extends WikiDialog{
if ( aWikiEditorForThrobber != null )
{
- InsertThrobber( 224, 122, 10, 10 );
+ InsertThrobber( 244, 122, 10, 10 );
m_aWikiEditor = aWikiEditorForThrobber;
}
@@ -82,7 +82,7 @@ public class WikiPropDialog extends WikiDialog{
e.printStackTrace();
}
}
-
+
private void InitStrings( XComponentContext xContext )
{
try
@@ -102,7 +102,7 @@ public class WikiPropDialog extends WikiDialog{
e.printStackTrace();
}
}
-
+
private void InitShowBrowser( XComponentContext xContext )
{
try
@@ -121,7 +121,7 @@ public class WikiPropDialog extends WikiDialog{
boolean bResult = super.show();
if ( bResult && Helper.GetShowInBrowserByDefault( m_xContext ) )
- Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle );
+ Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle );
return bResult;
}
@@ -144,7 +144,7 @@ public class WikiPropDialog extends WikiDialog{
public void fillWikiList()
{
String [] WikiList = m_aSettings.getWikiURLs();
-
+
try
{
XPropertySet xPS = GetPropSet("WikiList");
@@ -156,9 +156,9 @@ public class WikiPropDialog extends WikiDialog{
catch (Exception ex)
{
ex.printStackTrace();
- }
+ }
}
-
+
public void fillDocList()
{
XPropertySet xPS = GetPropSet("ArticleText");
@@ -172,8 +172,8 @@ public class WikiPropDialog extends WikiDialog{
ex.printStackTrace();
}
}
-
-
+
+
public String GetWikiTitle()
{
return m_sWikiTitle;
@@ -190,9 +190,9 @@ public class WikiPropDialog extends WikiDialog{
catch (Exception ex)
{
ex.printStackTrace();
- }
+ }
}
-
+
public void switchSendButtonIfNecessary()
{
@@ -251,7 +251,7 @@ public class WikiPropDialog extends WikiDialog{
ex.printStackTrace();
}
}
-
+
public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
{
if ( MethodName.equals( sSendMethod ) )
@@ -274,9 +274,9 @@ public class WikiPropDialog extends WikiDialog{
short minorState = ((Short) aMinorCheckProps.getPropertyValue("State")).shortValue();
if (minorState != 0)
m_bWikiMinorEdit = true;
- else
+ else
m_bWikiMinorEdit = false;
-
+
short nBrowserState = ((Short) aBrowserCheckProps.getPropertyValue("State")).shortValue();
Helper.SetShowInBrowserByDefault( m_xContext, nBrowserState != 0 );
@@ -295,7 +295,7 @@ public class WikiPropDialog extends WikiDialog{
// start spinning
SetThrobberVisible( true );
SetThrobberActive( true );
-
+
// the following method might show a dialog, should be used in main thread
final Hashtable aWikiSettings = m_aSettings.getSettingByUrl( m_sWikiEngineURL );
if ( Helper.AllowThreadUsage( m_xContext ) )
@@ -347,7 +347,7 @@ public class WikiPropDialog extends WikiDialog{
xDialogToClose.endExecute();
}
}
-
+
return true;
}
else if ( MethodName.equals( sWikiListMethod ) )
diff --git a/main/swext/mediawiki/src/description.xml b/main/swext/mediawiki/src/description.xml
index e2c104e..60dc157 100644
--- a/main/swext/mediawiki/src/description.xml
+++ b/main/swext/mediawiki/src/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,16 +8,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.
- *
+ *
***********************************************************-->
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="1.2.1"/>
@@ -35,6 +35,6 @@
<OpenOffice.org-maximal-version value="4.9" d:name="OpenOffice"/>
</dependencies>
<publisher>
- <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
+ <name xlink:href="https://www.openoffice.org" lang="en">Apache Software Foundation</name>
</publisher>
</description>
diff --git a/main/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs b/main/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
index 74a82e8..1d9a425 100644
--- a/main/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
+++ b/main/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,30 +8,30 @@
* 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.
- *
+ *
***********************************************************-->
-<oor:component-schema
- xmlns:oor="http://openoffice.org/2001/registry"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<oor:component-schema
+ xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- oor:name="WikiExtension"
- oor:package="org.openoffice.Office.Custom"
+ oor:name="WikiExtension"
+ oor:package="org.openoffice.Office.Custom"
xml:lang="en-US">
<info>
<desc>Configuration parameters for the accounts.</desc>
</info>
-
+
<templates>
<group oor:name="RequestArgument">
<info><desc>An argument for a request.</desc></info>
@@ -70,7 +70,7 @@
</prop>
</group>
</templates>
-
+
<component>
<set oor:name="SpecialData" oor:node-type="WikiServerSpecialData">
<info><desc>The set of smart configurations for MediaWiki Servers.</desc></info>
@@ -78,8 +78,8 @@
<set oor:name="ConnectionList" oor:node-type="ConnectionURL">
<info><desc>The list of the MediaWiki servers.</desc></info>
</set>
- <set oor:name="RecentDocs" oor:node-type="Document">
- <info><desc>The recenly stored documents.</desc></info>
+ <set oor:name="RecentDocs" oor:node-type="Document">
+ <info><desc>The recently stored documents.</desc></info>
</set>
<group oor:name="Settings">
<info><desc>The addon related settings.</desc></info>
@@ -122,7 +122,7 @@
<info><desc>"No" button in dialog.</desc></info>
</prop>
<prop oor:name="Dlg_OK" oor:type="xs:string" oor:localized="true">
- <info><desc>"Ok" button in dialog.</desc></info>
+ <info><desc>"OK" button in dialog.</desc></info>
</prop>
<prop oor:name="Dlg_Yes" oor:type="xs:string" oor:localized="true">
<info><desc>"Yes" button in dialog.</desc></info>