Kaydet (Commit) c199b76d authored tarafından Noel Grandin's avatar Noel Grandin

java: remove some unused local variables

Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
üst db203e59
...@@ -303,7 +303,7 @@ public class LocalOfficeConnection ...@@ -303,7 +303,7 @@ public class LocalOfficeConnection
com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null); com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null);
// initial serviceManager // initial serviceManager
XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager(); xLocalContext.getServiceManager();
// try to connect to soffice // try to connect to soffice
Object aInitialObject = null; Object aInitialObject = null;
...@@ -403,7 +403,6 @@ public class LocalOfficeConnection ...@@ -403,7 +403,6 @@ public class LocalOfficeConnection
} }
else { // new style else { // new style
int index = dcp.indexOf(':'); int index = dcp.indexOf(':');
String url = dcp.substring(0, index).trim();
dcp = dcp.substring(index + 1).trim(); dcp = dcp.substring(index + 1).trim();
index = dcp.indexOf(';'); index = dcp.indexOf(';');
......
...@@ -159,7 +159,6 @@ public class FinalizedMandatoryTest ...@@ -159,7 +159,6 @@ public class FinalizedMandatoryTest
System.out.println("------------------------------------------------"); System.out.println("------------------------------------------------");
try try
{ {
PropertyValue instanceProp = new PropertyValue();
filterName = filterNames[i]; filterName = filterNames[i];
System.out.println(filterName); System.out.println(filterName);
......
...@@ -77,7 +77,6 @@ public class Job { ...@@ -77,7 +77,6 @@ public class Job {
* @return the result of the message. * @return the result of the message.
*/ */
public Object execute() throws Throwable { public Object execute() throws Throwable {
Object msgResult = _iMessage.getResult();
if (_iMessage.isRequest()) { if (_iMessage.isRequest()) {
Object result = null; Object result = null;
Throwable exception = null; Throwable exception = null;
......
...@@ -36,7 +36,7 @@ public class UrlResolver_Test ...@@ -36,7 +36,7 @@ public class UrlResolver_Test
XComponentContext xcomponentcontext = Bootstrap.createInitialComponentContext( null ); XComponentContext xcomponentcontext = Bootstrap.createInitialComponentContext( null );
// initial serviceManager // initial serviceManager
XMultiComponentFactory xLocalServiceManager = xcomponentcontext.getServiceManager(); xcomponentcontext.getServiceManager();
// create a connector, so that it can contact the office // create a connector, so that it can contact the office
XUnoUrlResolver urlResolver XUnoUrlResolver urlResolver
......
...@@ -53,7 +53,7 @@ public class JREProperties ...@@ -53,7 +53,7 @@ public class JREProperties
{ {
try{ try{
//This line is needed to get the accessibility properties //This line is needed to get the accessibility properties
Toolkit tk = java.awt.Toolkit.getDefaultToolkit(); java.awt.Toolkit.getDefaultToolkit();
} }
catch(Throwable e) catch(Throwable e)
{ {
......
...@@ -90,7 +90,6 @@ public abstract class BaseDialog extends BaseControl { ...@@ -90,7 +90,6 @@ public abstract class BaseDialog extends BaseControl {
public BaseDialog(XComponentContext context, String title, int x, int y, int width, int height) { public BaseDialog(XComponentContext context, String title, int x, int y, int width, int height) {
super(context); super(context);
ModalState modalState = ModalState.Exit;
try { try {
xMCF = context.getServiceManager(); xMCF = context.getServiceManager();
setUnoModel(xMCF.createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", context)); setUnoModel(xMCF.createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", context));
......
...@@ -135,7 +135,6 @@ public class PentahoReportJob implements ReportJob ...@@ -135,7 +135,6 @@ public class PentahoReportJob implements ReportJob
this.masterValues = (ArrayList<?>) jobProperties.getProperty(ReportEngineParameterNames.INPUT_MASTER_VALUES); this.masterValues = (ArrayList<?>) jobProperties.getProperty(ReportEngineParameterNames.INPUT_MASTER_VALUES);
this.detailColumns = (ArrayList<?>) jobProperties.getProperty(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS); this.detailColumns = (ArrayList<?>) jobProperties.getProperty(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS);
Integer maxRows=(Integer) jobProperties.getProperty(ReportEngineParameterNames.MAXROWS);
this.resourceManager = new ResourceManager(); this.resourceManager = new ResourceManager();
this.resourceManager.registerDefaults(); this.resourceManager.registerDefaults();
......
...@@ -1037,7 +1037,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget ...@@ -1037,7 +1037,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document document = dBuilder.parse(new InputSource(inputStream)); Document document = dBuilder.parse(new InputSource(inputStream));
NodeList nl = document.getElementsByTagName("document-meta/meta/generator"); document.getElementsByTagName("document-meta/meta/generator");
Node node = document.getFirstChild().getFirstChild().getFirstChild().getFirstChild(); Node node = document.getFirstChild().getFirstChild().getFirstChild().getFirstChild();
String creator = node.getNodeValue(); String creator = node.getNodeValue();
node.setNodeValue(creator + "/report_builder"); node.setNodeValue(creator + "/report_builder");
......
...@@ -76,18 +76,14 @@ public class ParcelBrowseNode extends PropertySet implements ...@@ -76,18 +76,14 @@ public class ParcelBrowseNode extends PropertySet implements
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable"); registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Renamable", new Type(boolean.class), (short)0, "renamable"); registerProperty("Renamable", new Type(boolean.class), (short)0, "renamable");
String parcelDirUrl = parcel.getPathToParcel();
XComponentContext xCtx = provider.getScriptingContext().getComponentContext(); XComponentContext xCtx = provider.getScriptingContext().getComponentContext();
XMultiComponentFactory xFac = xCtx.getServiceManager(); XMultiComponentFactory xFac = xCtx.getServiceManager();
try { try {
UnoRuntime.queryInterface(XSimpleFileAccess.class,
XSimpleFileAccess xSFA = xFac.createInstanceWithContext(
UnoRuntime.queryInterface(XSimpleFileAccess.class, "com.sun.star.ucb.SimpleFileAccess",
xFac.createInstanceWithContext( xCtx));
"com.sun.star.ucb.SimpleFileAccess",
xCtx));
} catch (com.sun.star.uno.Exception e) { } catch (com.sun.star.uno.Exception e) {
// TODO propagate potential errors // TODO propagate potential errors
LogUtils.DEBUG("Caught exception creating ParcelBrowseNode " + e); LogUtils.DEBUG("Caught exception creating ParcelBrowseNode " + e);
......
...@@ -65,15 +65,13 @@ public class ProviderBrowseNode extends PropertySet implements ...@@ -65,15 +65,13 @@ public class ProviderBrowseNode extends PropertySet implements
registerProperty("Deletable", new Type(boolean.class), (short)0, "deletable"); registerProperty("Deletable", new Type(boolean.class), (short)0, "deletable");
registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable"); registerProperty("Creatable", new Type(boolean.class), (short)0, "creatable");
registerProperty("Editable", new Type(boolean.class), (short)0, "editable"); registerProperty("Editable", new Type(boolean.class), (short)0, "editable");
XSimpleFileAccess xSFA = null;
XMultiComponentFactory xFac = m_xCtx.getServiceManager(); XMultiComponentFactory xFac = m_xCtx.getServiceManager();
try { try {
UnoRuntime.queryInterface(XSimpleFileAccess.class,
xSFA = UnoRuntime.queryInterface(XSimpleFileAccess.class, xFac.createInstanceWithContext(
xFac.createInstanceWithContext( "com.sun.star.ucb.SimpleFileAccess",
"com.sun.star.ucb.SimpleFileAccess", xCtx));
xCtx));
} }
// TODO propage errors // TODO propage errors
catch (com.sun.star.uno.Exception e) { catch (com.sun.star.uno.Exception e) {
......
...@@ -71,8 +71,6 @@ public class ScriptBrowseNode extends PropertySet implements ...@@ -71,8 +71,6 @@ public class ScriptBrowseNode extends PropertySet implements
XMultiComponentFactory xFac = xCtx.getServiceManager(); XMultiComponentFactory xFac = xCtx.getServiceManager();
try { try {
ScriptMetaData data = (ScriptMetaData)parent.getByName(name);
XSimpleFileAccess xSFA = UnoRuntime.queryInterface( XSimpleFileAccess xSFA = UnoRuntime.queryInterface(
XSimpleFileAccess.class, XSimpleFileAccess.class,
xFac.createInstanceWithContext( xFac.createInstanceWithContext(
......
...@@ -148,7 +148,7 @@ public class ParcelDescriptor { ...@@ -148,7 +148,7 @@ public class ParcelDescriptor {
return new ScriptEntry[0]; return new ScriptEntry[0];
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
String language, languagename, logicalname, description = ""; String language, languagename, description = "";
Map<String, String> langProps = new HashMap<String, String>(); Map<String, String> langProps = new HashMap<String, String>();
NodeList nl; NodeList nl;
Element tmp; Element tmp;
...@@ -158,11 +158,9 @@ public class ParcelDescriptor { ...@@ -158,11 +158,9 @@ public class ParcelDescriptor {
nl = scriptElement.getElementsByTagName("logicalname"); nl = scriptElement.getElementsByTagName("logicalname");
if (nl == null) if (nl != null)
logicalname = ""; {
else {
tmp = (Element)nl.item(0); tmp = (Element)nl.item(0);
logicalname = tmp.getAttribute("value");
} }
// get the text of the description element // get the text of the description element
......
...@@ -165,7 +165,6 @@ public class UnoPkgContainer extends ParcelContainer { ...@@ -165,7 +165,6 @@ public class UnoPkgContainer extends ParcelContainer {
com.sun.star.container.NoSuchElementException, com.sun.star.container.NoSuchElementException,
com.sun.star.lang.WrappedTargetException { com.sun.star.lang.WrappedTargetException {
ScriptMetaData scriptData = null;
String functionName = psu.function; String functionName = psu.function;
String parcelName = psu.parcel; String parcelName = psu.parcel;
String location = psu.location; String location = psu.location;
......
...@@ -180,8 +180,6 @@ class ScriptImpl implements XScript { ...@@ -180,8 +180,6 @@ class ScriptImpl implements XScript {
aOutParamIndex[0] = new short[0]; aOutParamIndex[0] = new short[0];
aOutParam[0] = new Object[0]; aOutParam[0] = new Object[0];
Map<String, String> languageProps = metaData.getLanguageProperties();
ScriptDescriptor scriptDesc = ScriptDescriptor scriptDesc =
new ScriptDescriptor(metaData.getLanguageName()); new ScriptDescriptor(metaData.getLanguageName());
......
...@@ -182,11 +182,10 @@ class ScriptImpl implements XScript { ...@@ -182,11 +182,10 @@ class ScriptImpl implements XScript {
aOutParam[0] = new Object[0]; aOutParam[0] = new Object[0];
ClassLoader cl = null; ClassLoader cl = null;
URL sourceUrl = null;
try { try {
cl = ClassLoaderFactory.getURLClassLoader(metaData); cl = ClassLoaderFactory.getURLClassLoader(metaData);
sourceUrl = metaData.getSourceURL(); metaData.getSourceURL();
} catch (java.net.MalformedURLException mfu) { } catch (java.net.MalformedURLException mfu) {
throw new ScriptFrameworkErrorException( throw new ScriptFrameworkErrorException(
mfu.getMessage(), null, mfu.getMessage(), null,
...@@ -197,14 +196,12 @@ class ScriptImpl implements XScript { ...@@ -197,14 +196,12 @@ class ScriptImpl implements XScript {
Context ctxt = null; Context ctxt = null;
try { try {
String editorURL = sourceUrl.toString();
Object result = null; Object result = null;
ScriptEditorForJavaScript editor = ScriptEditorForJavaScript editor =
ScriptEditorForJavaScript.getEditor(metaData.getSourceURL()); ScriptEditorForJavaScript.getEditor(metaData.getSourceURL());
if (editor != null) { if (editor != null) {
editorURL = editor.getURL();
result = editor.execute(); result = editor.execute();
if (result != null && if (result != null &&
......
...@@ -146,9 +146,7 @@ public class CheckBookmarks { ...@@ -146,9 +146,7 @@ public class CheckBookmarks {
throws com.sun.star.uno.Exception throws com.sun.star.uno.Exception
{ {
XText xText = m_xDoc.getText(); XText xText = m_xDoc.getText();
XSimpleText xSimpleText = UnoRuntime.queryInterface( UnoRuntime.queryInterface(XSimpleText.class, xText);
XSimpleText.class,
xText);
for(int nPara=0; nPara<10; ++nPara) { for(int nPara=0; nPara<10; ++nPara) {
for(int nBookmark=0; nBookmark<100; ++nBookmark){ for(int nBookmark=0; nBookmark<100; ++nBookmark){
insertBookmark( insertBookmark(
......
...@@ -589,7 +589,7 @@ class FuzzyTester ...@@ -589,7 +589,7 @@ class FuzzyTester
TreeNode node = m_BufferExpected.get(i); TreeNode node = m_BufferExpected.get(i);
int j = m_BufferActual.indexOf(node); int j = m_BufferActual.indexOf(node);
if (j >= 0) { if (j >= 0) {
TreeNode other = m_BufferActual.get(j); m_BufferActual.get(j);
if (j != i) if (j != i)
{ {
//FIXME how bad is this? //FIXME how bad is this?
......
...@@ -608,7 +608,6 @@ public class Helper ...@@ -608,7 +608,6 @@ public class Helper
aProxyPortProp = "ooInetHTTPSProxyPort"; aProxyPortProp = "ooInetHTTPSProxyPort";
} }
String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );
String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) ); String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );
int nProxyPort = 80; int nProxyPort = 80;
......
...@@ -107,18 +107,11 @@ public final class WikiEditorImpl extends WeakBase ...@@ -107,18 +107,11 @@ public final class WikiEditorImpl extends WeakBase
} }
private boolean m_bInitialized;
public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception
{ {
if ( m_bInitialized )
{
}
if ( args.length > 0 ) if ( args.length > 0 )
{ {
m_bInitialized = true;
m_xFrame = UnoRuntime.queryInterface( XFrame.class, args[0] ); m_xFrame = UnoRuntime.queryInterface( XFrame.class, args[0] );
// become close listener
XCloseBroadcaster cb = UnoRuntime.queryInterface( XCloseBroadcaster.class, m_xFrame );
} }
} }
...@@ -197,7 +190,7 @@ public final class WikiEditorImpl extends WeakBase ...@@ -197,7 +190,7 @@ public final class WikiEditorImpl extends WeakBase
{ {
try try
{ {
URI uri = new URI( uristring ); new URI( uristring );
// check whether any blogs are live... // check whether any blogs are live...
setListenerState( "command"); setListenerState( "command");
......
...@@ -108,7 +108,6 @@ class TopWindowListener ...@@ -108,7 +108,6 @@ class TopWindowListener
if (aObject instanceof VectorNode && xTopLevelObject != null) if (aObject instanceof VectorNode && xTopLevelObject != null)
{ {
System.out.println ("removing node " + xTopLevelObject); System.out.println ("removing node " + xTopLevelObject);
VectorNode aRoot = (VectorNode) aObject;
maModel.removeNode (xTopLevelObject.getAccessibleContext()); maModel.removeNode (xTopLevelObject.getAccessibleContext());
} }
} }
......
...@@ -179,7 +179,6 @@ public static class StateSetAllView ...@@ -179,7 +179,6 @@ public static class StateSetAllView
XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet(); XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet();
if (xStateSet != null) if (xStateSet != null)
{ {
short aStates[] = xStateSet.getStates ();
final int nMaxStateIndex = AccessibleStateType.MANAGES_DESCENDANTS; final int nMaxStateIndex = AccessibleStateType.MANAGES_DESCENDANTS;
int nStateWidth = (aWidgetArea.width-12) / (nMaxStateIndex+1); int nStateWidth = (aWidgetArea.width-12) / (nMaxStateIndex+1);
AffineTransform aTransform = g.getTransform (); AffineTransform aTransform = g.getTransform ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment