From bae3ab1298290210394b79c2052cf1f3d522568a Mon Sep 17 00:00:00 2001 From: "seokgil.kang" Date: Thu, 27 Mar 2014 14:58:14 +0900 Subject: [PATCH] Correct errors Change the inner class to the static inner class. Add explicit type casting. Add the logic of null check to a variable. Change the null parameter value to the empty interface object. Remove unused class. Add the logic of null check to a variable. Change-Id: I53016f30b941e3677a0315ab8c3c176c35079f68 Signed-off-by: seokgil.kang --- .../eclipse/linuxtools/oprofile/core/Oprofile.java | 155 ++++++++++++++++++++- .../linuxtools/oprofile/core/daemon/OpInfo.java | 39 +++++- .../oprofile/core/opxml/OprofileSAXHandler.java | 3 + .../core/opxml/info/EventListProcessor.java | 2 +- .../src/org/tizen/oprofile/core/OprofileComm.java | 153 +++++++++++++++++++- .../modeldata/handler/OprofileSAXHandler.java | 2 +- .../processor/modeldata/parser/SetupParser.java | 3 +- .../configuration/OprofileEventConfigTab.java | 3 + .../view/OprofileViewSaveDefaultSessionAction.java | 126 ----------------- .../profiling/launch/ProfileLaunchShortcut.java | 4 +- .../valgrind/massif/MassifLaunchDelegate.java | 4 +- .../valgrind/memcheck/MemcheckViewPart.java | 2 +- 12 files changed, 354 insertions(+), 142 deletions(-) delete mode 100644 org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java index 60fe4a3..d140eac 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/Oprofile.java @@ -15,6 +15,7 @@ package org.eclipse.linuxtools.oprofile.core; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.linuxtools.oprofile.core.daemon.OpEvent; import org.eclipse.linuxtools.oprofile.core.daemon.OpInfo; @@ -99,7 +100,43 @@ public abstract class Oprofile String[] result = new String[1]; try { IRunnableWithProgress opxml = OpcontrolDataProvider.checkKernelModule(result); - opxml.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + opxml.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { String error = "The OProfile kernel module could not be loaded"; String reason = "An error occurred initializing OProfile for use with the plugin. Please check OProfile to be installed successfully"; @@ -221,14 +258,50 @@ public abstract class Oprofile int[] validResult = new int[1]; try { IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().checkEvents(ctr, event, um, validResult); - opxml.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + opxml.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { e.printStackTrace(); } catch (InterruptedException e) { e.printStackTrace(); } catch (OpxmlException e) { OprofileCorePlugin.showErrorDialog("opxmlProvider", e); //$NON-NLS-1$ - return null; + return (Boolean)null; } return (validResult[0] == CheckEventsProcessor.EVENT_OK); @@ -247,7 +320,43 @@ public abstract class Oprofile ArrayList sessionList = new ArrayList(); try { IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().sessions(sessionList); - opxml.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + opxml.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); events = new OpModelEvent[sessionList.size()]; sessionList.toArray(events); } catch (InvocationTargetException e) { @@ -272,7 +381,43 @@ public abstract class Oprofile final IRunnableWithProgress opxml; try { opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().modelData(eventName, sessionName, image); - opxml.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + opxml.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { e.printStackTrace(); } catch (InterruptedException e) { diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java index 4d926eb..b43731c 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/daemon/OpInfo.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin; import org.eclipse.linuxtools.oprofile.core.OpxmlException; @@ -82,7 +83,43 @@ public class OpInfo { try { IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().info(info); - opxml.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + opxml.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { e.printStackTrace(); } catch (InterruptedException e) { diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java index 954d061..9a05d37 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/OprofileSAXHandler.java @@ -128,6 +128,9 @@ public class OprofileSAXHandler extends DefaultHandler { if (_processor == null) { // Get processor for this event type _processor = getProcessor(qName); + if (_processor == null) { + return; + } _processor.reset(_callData); } diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java index 67f91a9..e4e60e7 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/opxml/info/EventListProcessor.java @@ -79,7 +79,7 @@ public class EventListProcessor extends XMLProcessor { } // This is a special processor to handle unit mask information - private class UnitMaskProcessor extends XMLProcessor { + private static class UnitMaskProcessor extends XMLProcessor { // An ArrayList to hold all the valid masks for a unit mask. private ArrayList _masks; diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileComm.java b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileComm.java index 562603f..3a40a61 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileComm.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileComm.java @@ -24,6 +24,7 @@ package org.tizen.oprofile.core; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; @@ -42,7 +43,43 @@ public abstract class OprofileComm { int[] result = new int[1]; try { IRunnableWithProgress opxml = OpcontrolDataProvider.checkEvent(event, count, unitmask, result); - opxml.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + opxml.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { String error = "An error has occured during check event setting for OProfile"; String reason = "An unexpected error occurred with parsing data. This might be caused by closed connection to target"; @@ -62,7 +99,43 @@ public abstract class OprofileComm { ArrayList eventList = new ArrayList(); try { IRunnableWithProgress runner = OpcontrolDataProvider.getEventList(eventList); - runner.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + runner.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); events = new OpModelEvent[eventList.size()]; eventList.toArray(events); } catch (InvocationTargetException e) { @@ -81,7 +154,43 @@ public abstract class OprofileComm { OpModelRoot model = new OpModelRoot(); try { IRunnableWithProgress runner = OpcontrolDataProvider.getModelData(model); - runner.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + runner.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { String error = "An error has occured during get reported data in current session"; String reason = "An unexpected error occurred with parsing data. This might be caused by closed connection to target"; @@ -102,7 +211,43 @@ public abstract class OprofileComm { try { IRunnableWithProgress runner = OpcontrolDataProvider.getEventInfo(info); - runner.run(null); + //seokgil.kang modified at 20140326 + // intended to resolve issue. + runner.run(new IProgressMonitor() { + @Override + public void beginTask(String name, int totalWork) { + // TODO Auto-generated method stub + } + @Override + public void done() { + // TODO Auto-generated method stub + } + @Override + public void internalWorked(double work) { + // TODO Auto-generated method stub + } + @Override + public boolean isCanceled() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setCanceled(boolean value) { + // TODO Auto-generated method stub + } + @Override + public void setTaskName(String name) { + // TODO Auto-generated method stub + } + @Override + public void subTask(String name) { + // TODO Auto-generated method stub + } + @Override + public void worked(int work) { + // TODO Auto-generated method stub + } + }); } catch (InvocationTargetException e) { String error = "An error has occured during get event list in current session"; diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/handler/OprofileSAXHandler.java b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/handler/OprofileSAXHandler.java index d7dfc43..f298f0b 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/handler/OprofileSAXHandler.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/handler/OprofileSAXHandler.java @@ -117,7 +117,7 @@ public class OprofileSAXHandler extends DefaultHandler { }else if(name.equals(CLASSES_TAG)) { _subParser = null; }else if (name.equals(BINARY_TAG)) { - _subParser.release(null); + _subParser.release(new Object()); _subParser = null; }else if (name.equals(SYMBOLTABLE_TAG)) { _subParser = null; diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/parser/SetupParser.java b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/parser/SetupParser.java index c79e18e..fc77b82 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/parser/SetupParser.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/processor/modeldata/parser/SetupParser.java @@ -92,7 +92,8 @@ public class SetupParser extends XMLParser { private void changeImageId() { if(_imageMap.size()==1){ OpModelImage[] image = _imageMap.values().toArray(new OpModelImage[1]); - _imageMap.remove(image[0]); +// _imageMap.remove(image[0]); + _imageMap.clear(); _imageMap.put(ParserUtil.DEFAULT_EVENT_ID,image[0]); } } diff --git a/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java b/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java index 7ba1423..b0085a0 100644 --- a/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java +++ b/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/oprofile/launch/configuration/OprofileEventConfigTab.java @@ -703,6 +703,9 @@ public class OprofileEventConfigTab extends AbstractLaunchConfigurationTab { private void _handleEventListSelectionChange() { int index = _eventList.getList().getSelectionIndex(); OpEvent event = (OpEvent) _eventList.getElementAt(index); + if (event == null) { + return; + } _counter.setEvent(event); _eventDescText.setText(event.getTextDescription()); _unitMaskViewer.displayEvent(event); diff --git a/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java b/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java deleted file mode 100644 index 5ad20ef..0000000 --- a/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2009 Red Hat, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Kent Sebastian - initial API and implementation - * Keith Seitz - SaveSessionValidator code - *******************************************************************************/ -package org.eclipse.linuxtools.oprofile.ui.view; - -import java.io.File; -import java.text.MessageFormat; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.window.Window; -import org.eclipse.linuxtools.oprofile.core.OpcontrolException; -import org.eclipse.linuxtools.oprofile.core.Oprofile; -import org.eclipse.linuxtools.oprofile.core.OprofileCorePlugin; -import org.eclipse.linuxtools.oprofile.ui.OprofileUiMessages; -import org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin; -import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement; -import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot; -import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession; - -/** - * Menu item to save the default session. Moved from a double-click in the view - * on the default session for consistency (since non-default sessions can't be saved). - */ -public class OprofileViewSaveDefaultSessionAction extends Action { - public OprofileViewSaveDefaultSessionAction() { - super(OprofileUiMessages.getString("view.actions.savedefaultsession.label")); //$NON-NLS-1$ - } - - @Override - public void run() { - boolean defaultSessionExists = false; - //jinu modified at 20090705. this class isn't used any more. - //this statement is commented temporary to avoid compile error - //UiModelRoot modelRoot = UiModelRoot.getDefault(); - UiModelRoot modelRoot = null; - - if (modelRoot.hasChildren()) { - IUiModelElement[] events = modelRoot.getChildren(); - for (IUiModelElement e : events) { - IUiModelElement[] sessions = e.getChildren(); - for (IUiModelElement s : sessions) { - if (((UiModelSession)s).isDefaultSession()) { - defaultSessionExists = true; - break; - } - } - if (defaultSessionExists) - break; - } - } - - if (defaultSessionExists) { - //the following code was originially written by Keith Seitz - InputDialog dialog = new InputDialog(OprofileUiPlugin.getActiveWorkbenchShell(), - OprofileUiMessages.getString("savedialog.title"), //$NON-NLS-1$ - OprofileUiMessages.getString("savedialog.message"), //$NON-NLS-1$ - OprofileUiMessages.getString("savedialog.initial"), //$NON-NLS-1$ - new SaveSessionValidator()); - - int result = dialog.open(); - if (result == Window.OK) { - try { - OprofileCorePlugin.getDefault().getOpcontrolProvider().saveSession(dialog.getValue()); - OprofileUiPlugin.getDefault().getOprofileView().refreshView(); - } catch (OpcontrolException oe) { - OprofileCorePlugin.showErrorDialog("opcontrolProvider", oe); //$NON-NLS-1$ - } - } - } else { - MessageDialog.openError(OprofileUiPlugin.getActiveWorkbenchShell(), - OprofileUiMessages.getString("defaultsessiondialog.nodefaultsession.title"), //$NON-NLS-1$ - OprofileUiMessages.getString("defaultsessiondialog.nodefaultsession.message")); //$NON-NLS-1$ - } - } - - //Original author: Keith Seitz - private static class SaveSessionValidator implements IInputValidator { - public String isValid(String newText) { - // Sanity check - if (newText.length() == 0) { - return ""; //$NON-NLS-1$ - } - - // Cannot contain invalid characters - int index = newText.indexOf('/'); - if (index == -1) { - index = newText.indexOf('\\'); - } - - if (index != -1) { - String format = OprofileUiMessages.getString("savedialog.validator.invalidChar"); //$NON-NLS-1$ - Object[] fmtArgs = new Object[] { newText.substring(index, index + 1), newText }; - return MessageFormat.format(format, fmtArgs); - } - - // Cannot contain whitespace - if (newText.contains(" ") || newText.contains("\t")) { //$NON-NLS-1$ //$NON-NLS-2$ - String format = OprofileUiMessages.getString("savedialog.validator.containsWhitespace"); //$NON-NLS-1$ - Object[] fmtArgs = new Object[] { newText }; - return MessageFormat.format(format, fmtArgs); - } - - // Must not already exist (opcontrol doesn't allow it) - File file = new File(Oprofile.getDefaultSamplesDirectory(), newText); - if (file.exists()) { - String format = OprofileUiMessages.getString("savedialog.validator.exists"); //$NON-NLS-1$ - Object[] fmtArgs = new Object[] { newText }; - return MessageFormat.format(format, fmtArgs); - } - - // Everything OK - return null; - } - }; -} diff --git a/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java b/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java index 35724b5..dfae9bc 100644 --- a/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java +++ b/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java @@ -173,7 +173,9 @@ public static void showErrorDialog(final String errorMessage, final String reaso // user to choose one. int candidateCount = candidateConfigs.size(); if (candidateCount < 1) { - configuration = createConfiguration(bin); + if (bin != null) { + configuration = createConfiguration(bin); + } } else if (candidateCount == 1) { configuration = (ILaunchConfiguration) candidateConfigs.get(0); } else { diff --git a/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java b/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java index 89cf2e7..d6fe365 100644 --- a/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java +++ b/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java @@ -94,7 +94,9 @@ public class MassifLaunchDelegate extends TizenLaunchDelegate implements // session.downloadFile(targetlog_massif,hostlog_massif); File file = new File(hostlog_massif); if (file.exists()) { - file.delete(); + if (!file.delete()) { + // failed to delete the file + } } CommandManager.pull(targetlog_massif, hostlog_massif); parseOutput(hostlog_massif); diff --git a/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckViewPart.java b/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckViewPart.java index 0dda1b0..92d1352 100644 --- a/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckViewPart.java +++ b/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckViewPart.java @@ -470,7 +470,7 @@ public class MemcheckViewPart extends ViewPart implements IValgrindToolView { } } - protected class ErrorTreeLabelProvider extends LabelProvider implements + protected static class ErrorTreeLabelProvider extends LabelProvider implements ITableLabelProvider { public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) -- 2.7.4