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 <seokgil.kang@samsung.com>
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;
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";
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);
ArrayList<OpModelEvent> sessionList = new ArrayList<OpModelEvent>();
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) {
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) {
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;
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) {
if (_processor == null) {
// Get processor for this event type
_processor = getProcessor(qName);
+ if (_processor == null) {
+ return;
+ }
_processor.reset(_callData);
}
}
// 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<OpUnitMask.MaskInfo> _masks;
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;
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";
ArrayList<OpModelEvent> eventList = new ArrayList<OpModelEvent>();
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) {
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";
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";
}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;
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]);
}
}
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);
+++ /dev/null
-/*******************************************************************************
- * 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 <ksebasti@redhat.com> - initial API and implementation
- * Keith Seitz <keiths@redhat.com> - 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 <keiths@redhat.com>
- 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;
- }
- };
-}
// 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 {
// 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);
}
}
- protected class ErrorTreeLabelProvider extends LabelProvider implements
+ protected static class ErrorTreeLabelProvider extends LabelProvider implements
ITableLabelProvider {
public Image getColumnImage(Object element, int columnIndex) {
if (columnIndex == 0)
projects / sdk / ide / profiler-eplugin.git / commitdiff