mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java: remove some unused local variables

Browse Source 
Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
This commit is contained in:
Noel Grandin
2014-12-05 11:03:50 +02:00
parent db203e59d6
commit c199b76d88
21 changed files with 19 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
View File

@@ -76,18 +76,14 @@ public class ParcelBrowseNode extends PropertySet implements
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Renamable", new Type(boolean.class), (short)0, "renamable");
String parcelDirUrl = parcel.getPathToParcel();
XComponentContext xCtx = provider.getScriptingContext().getComponentContext();
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
XSimpleFileAccess xSFA =
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
} catch (com.sun.star.uno.Exception e) {
// TODO propagate potential errors
LogUtils.DEBUG("Caught exception creating ParcelBrowseNode " + e);

10
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
View File

@@ -65,15 +65,13 @@ public class ProviderBrowseNode extends PropertySet implements
registerProperty("Deletable", new Type(boolean.class), (short)0, "deletable");
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Editable", new Type(boolean.class), (short)0, "editable");
XSimpleFileAccess xSFA = null;
XMultiComponentFactory xFac = m_xCtx.getServiceManager();
try {
xSFA = UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xFac.createInstanceWithContext(
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
}
// TODO propage errors
catch (com.sun.star.uno.Exception e) {

2
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
View File

@@ -71,8 +71,6 @@ public class ScriptBrowseNode extends PropertySet implements
XMultiComponentFactory xFac = xCtx.getServiceManager();
try {
ScriptMetaData data = (ScriptMetaData)parent.getByName(name);
XSimpleFileAccess xSFA = UnoRuntime.queryInterface(
XSimpleFileAccess.class,
xFac.createInstanceWithContext(

8
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
View File

@@ -148,7 +148,7 @@ public class ParcelDescriptor {
return new ScriptEntry[0];
for (int i = 0; i < len; i++) {
String language, languagename, logicalname, description = "";
String language, languagename, description = "";
Map<String, String> langProps = new HashMap<String, String>();
NodeList nl;
Element tmp;
@@ -158,11 +158,9 @@ public class ParcelDescriptor {
nl = scriptElement.getElementsByTagName("logicalname");
if (nl == null)
logicalname = "";
else {
if (nl != null)
{
tmp = (Element)nl.item(0);
logicalname = tmp.getAttribute("value");
}
// get the text of the description element

1
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
View File

@@ -165,7 +165,6 @@ public class UnoPkgContainer extends ParcelContainer {
com.sun.star.container.NoSuchElementException,
com.sun.star.lang.WrappedTargetException {
ScriptMetaData scriptData = null;
String functionName = psu.function;
String parcelName = psu.parcel;
String location = psu.location;

2
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
View File

@@ -180,8 +180,6 @@ class ScriptImpl implements XScript {
aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0];
Map<String, String> languageProps = metaData.getLanguageProperties();
ScriptDescriptor scriptDesc =
new ScriptDescriptor(metaData.getLanguageName());

5
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
View File

@@ -182,11 +182,10 @@ class ScriptImpl implements XScript {
aOutParam[0] = new Object[0];
ClassLoader cl = null;
URL sourceUrl = null;
try {
cl = ClassLoaderFactory.getURLClassLoader(metaData);
sourceUrl = metaData.getSourceURL();
metaData.getSourceURL();
} catch (java.net.MalformedURLException mfu) {
throw new ScriptFrameworkErrorException(
mfu.getMessage(), null,
@@ -197,14 +196,12 @@ class ScriptImpl implements XScript {
Context ctxt = null;
try {
String editorURL = sourceUrl.toString();
Object result = null;
ScriptEditorForJavaScript editor =
ScriptEditorForJavaScript.getEditor(metaData.getSourceURL());
if (editor != null) {
editorURL = editor.getURL();
result = editor.execute();
if (result != null &&