summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-04 16:12:55 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:49 +0200
commitf124688cfdfbe96ff2be5ab44ea5023725548146 (patch)
tree4874bf2b2504979b9733f200e05b68034c7eaefe /scripting
parent36a74fe54a0cd99372ea646af31ce41ac5ec5b08 (diff)
java: remove various unused variables
Change-Id: Id9f30938f594cb6fe73bf40adfffa65ec1b42cd1
Diffstat (limited to 'scripting')
-rw-r--r--scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java1
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java1
-rw-r--r--scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java1
-rw-r--r--scripting/java/com/sun/star/script/framework/io/XStorageHelper.java3
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java1
-rw-r--r--scripting/workben/installer/FileUpdater.java4
-rw-r--r--scripting/workben/installer/IdeFinal.java2
-rw-r--r--scripting/workben/installer/InstUtil.java4
-rw-r--r--scripting/workben/installer/Register.java1
-rw-r--r--scripting/workben/installer/Version.java1
-rw-r--r--scripting/workben/installer/XmlUpdater.java7
12 files changed, 2 insertions, 26 deletions
diff --git a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
index 9a9cb5eb4ef2..fa95d065d67a 100644
--- a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
+++ b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
@@ -73,7 +73,6 @@ public class DeployedUnoPackagesDB {
ArrayList<String> packageUrls = new ArrayList<String>(4);
Element main = document.getDocumentElement();
Element root = null;
- Element item;
int len = 0;
NodeList langNodes = null;
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 2270d544fc91..48a7289abdd3 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -341,10 +341,8 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
}
protected boolean writeSourceFile()
{
- String parcelLocation = parent.getPathToParcel();
String sourceFilePath = parent.getPathToParcel() + "/" + getLanguageName();
boolean result = false;
- OutputStream os = null;
try
{
XSimpleFileAccess2 xSFA2 = UnoRuntime.queryInterface( XSimpleFileAccess2.class,
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 027c3fa9af51..e592b028a921 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -183,7 +183,6 @@ public class UnoPkgContainer extends ParcelContainer
{
ScriptMetaData scriptData = null;
- String language = psu.language;
String functionName = psu.function;
String parcelName = psu.parcel;
String location = psu.location;
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 27254a42d0b5..8b06fb84ed51 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -192,7 +192,6 @@ public class UCBStreamHandler extends URLStreamHandler {
{
ZipInputStream zis = null;
ZipEntry entry = null;
- boolean found = false;
zis = new ZipInputStream(is);
diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index ba507afc6a6a..c936aacfae07 100644
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
@@ -184,8 +184,7 @@ public class XStorageHelper implements XEventListener
if ( model != null )
{
LogUtils.DEBUG(" Disposing doc " + model.getURL() );
- Object result = modelMap.remove( model );
- result = null;
+ modelMap.remove( model );
}
}
public XStorage getStorage()
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index a348dffd85d8..3d886215d807 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -549,7 +549,6 @@ public abstract class ScriptProvider
public String[] getElementNames()
{
// TODO needs implementing?
- String[] result = new String[0];
throw new com.sun.star.uno.RuntimeException(
"getElementNames not implemented" );
diff --git a/scripting/workben/installer/FileUpdater.java b/scripting/workben/installer/FileUpdater.java
index 21c3d34dd367..17d1ad9ba88d 100644
--- a/scripting/workben/installer/FileUpdater.java
+++ b/scripting/workben/installer/FileUpdater.java
@@ -25,7 +25,6 @@ public class FileUpdater {
public static boolean updateProtocolHandler( String installPath, JLabel statusLabel ) {
File in_file = null;
- FileInputStream in = null;
File out_file = null;
FileWriter out = null;
int count = 0;
@@ -95,7 +94,6 @@ public class FileUpdater {
public static boolean updateScriptXLC( String installPath, JLabel statusLabel ) {
File in_file = null;
- FileInputStream in = null;
File out_file = null;
FileWriter out = null;
int count = 0;
@@ -167,7 +165,6 @@ public class FileUpdater {
public static boolean updateDialogXLC( String installPath, JLabel statusLabel ) {
File in_file = null;
- FileInputStream in = null;
File out_file = null;
FileWriter out = null;
int count = 0;
@@ -175,7 +172,6 @@ public class FileUpdater {
//System.out.println( "updateDialogXLC" );
try {
in_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"dialog.xlc" );
- String xmlLine = "";
String[] xmlArray = new String[50];
try {
diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java
index 2d91929358ab..eac052191731 100644
--- a/scripting/workben/installer/IdeFinal.java
+++ b/scripting/workben/installer/IdeFinal.java
@@ -76,9 +76,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst
ArrayList<?> locations = InstallWizard.getLocations();
//System.out.println("here "+locations.size());
// Returned 1
- String progpath=null;
String path=null;
- String classespath=null;
for (int i =0;i<locations.size();i++){
path= (String)locations.get(i);
diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java
index 26ec2027b4d6..0fb687c80f00 100644
--- a/scripting/workben/installer/InstUtil.java
+++ b/scripting/workben/installer/InstUtil.java
@@ -181,7 +181,6 @@ public class InstUtil {
return null;
}*/
- File theFile = null;
Properties results = new Properties();
StringBuffer str = new StringBuffer();
@@ -197,7 +196,6 @@ public class InstUtil {
if( jeditLogFile.exists() ) {
String[] jeditDetails = getJeditInstallation( jeditLogFile );
System.out.println( "getJeditLocation ) " + jeditDetails[0] );
- File f = new File(jeditDetails[0]);
results.put("jEdit "+jeditDetails[1], jeditDetails[0]);
System.out.println( "jeditDetails[0] is " + jeditDetails[0]);
}
@@ -439,7 +437,7 @@ public class InstUtil {
System.err.println("Problem with sversion.ini");
}
try {
- Properties vers = InstUtil.getOfficeVersions(f);
+ InstUtil.getOfficeVersions(f);
} catch (IOException e) {
e.printStackTrace();
System.err.println(e);
diff --git a/scripting/workben/installer/Register.java b/scripting/workben/installer/Register.java
index 7e4c4c87d8b5..e2d7ceabc9af 100644
--- a/scripting/workben/installer/Register.java
+++ b/scripting/workben/installer/Register.java
@@ -73,7 +73,6 @@ public class Register{
String[] packages = {"ooscriptframe.zip", "bshruntime.zip", "jsruntime.zip"};
try {
- String s=null;
boolean goodResult = false;
String env[] = new String[1];
ExecCmd command = new ExecCmd();
diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java
index d1c7c819f6f4..ec3420b2bb18 100644
--- a/scripting/workben/installer/Version.java
+++ b/scripting/workben/installer/Version.java
@@ -251,7 +251,6 @@ class MyTableModel extends AbstractTableModel {
data = new ArrayList<ArrayList<Object>>();
boolean isWindows =
(System.getProperty("os.name").indexOf("Windows") != -1);
- int len = validVersions.length;
for (Enumeration e = properties.propertyNames(); e.hasMoreElements() ;) {
String key = (String)e.nextElement();
String path = null;
diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java
index d9f9832bc4b8..7dfe5eca37e1 100644
--- a/scripting/workben/installer/XmlUpdater.java
+++ b/scripting/workben/installer/XmlUpdater.java
@@ -20,13 +20,11 @@ package installer;
import java.io.*;
import java.util.*;
-import java.net.URL;
import javax.swing.*;
public class XmlUpdater extends Thread {
private String classesPath = null;
- private String jarfilename;
private String installPath;
private boolean netInstall;
private boolean bindingsInstall;
@@ -154,19 +152,14 @@ public class XmlUpdater extends Thread {
public void run() {
- InputStream istream;
//InputSource isource;
//DocumentBuilderFactory builderFactory;
//DocumentBuilder builder = null;
- URL url;
- String fileName = null;
internalThread = Thread.currentThread();
//System.out.println("\n\n\n\nFileName: "+installPath);
classesPath= installPath.concat(File.separator+"program"+File.separator+"classes"+File.separator);
- String opSys =System.getProperty("os.name");
- //System.out.println("\n System "+opSys);
String progpath=installPath;
progpath= progpath.concat(File.separator+"program"+File.separator);