From a894e1285ae24b0134c784dd928256e082e7f7e5 Mon Sep 17 00:00:00 2001 From: jooyoul_lee Date: Mon, 11 Nov 2013 18:10:48 +0900 Subject: [PATCH] [Title] remove warning, boiler palte added [Desc.] [Issue] --- .../listeners/TableTooltipListener.java | 2 +- .../tizen/dynamicanalyzer/logparser/LogParser.java | 8 -- .../swap/logparser/MessageParser.java | 5 +- .../swap/platform/BinarySettingManager.java | 1 - .../swap/platform/ui/BinaryAddDialog.java | 28 ++++- .../platform/ui/DeviceExplorer/DeviceExplorer.java | 38 +++++- .../ui/DeviceExplorer/DeviceExplorerDilaog.java | 29 ++++- .../swap/platform/ui/ExplorerUtil.java | 26 ++++ .../platform/ui/FileExplorer/DAFileExplorer.java | 44 ++++++- .../DAFileExplorerEmptyCellRenderer.java | 26 ++++ .../FileExplorer/DAFileExplorerTableRenderer.java | 25 ++++ .../ui/FileExplorer/FileExplorerDialog.java | 92 +++++++++----- .../dynamicanalyzer/ui/summary/leaks/LeakData.java | 1 - .../ui/summary/leaks/LeakDetector.java | 139 ++++++++++----------- .../ui/thread/ThreadAPIListTable.java | 1 - .../ui/timeline/calltrace/UserFunctionManager.java | 92 -------------- .../toolbar/configuration/BinarySettingsPage.java | 26 ++++ .../toolbar/configuration/ConfigurationDialog.java | 12 +- .../tizen/dynamicanalyzer/utils/XMLManager.java | 76 ----------- 19 files changed, 365 insertions(+), 306 deletions(-) delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/UserFunctionManager.java delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/XMLManager.java diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java index 68da76f..2c63c60 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java @@ -1,7 +1,7 @@ /* * Dynamic Analyzer * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: * Jooyoul Lee diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java index f2f2010..25f00ac 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java @@ -33,25 +33,17 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.common.SymbolManager; import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; -import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; -import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.swap.channel.data.ApiNameManager; import org.tizen.dynamicanalyzer.swap.channel.data.BasicDataMessage; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; -import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.swap.model.data.ScreenShotData; import org.tizen.dynamicanalyzer.swap.model.data.SystemData; import org.tizen.dynamicanalyzer.swap.model.data.UserFunctionData; import org.tizen.dynamicanalyzer.ui.page.BaseView; -import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.uirecorder.UIRecorderPlayThread; -import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.ImageUtil; import org.tizen.sdblib.service.SyncResult; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java index 65d01b8..66db1d8 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java @@ -60,7 +60,6 @@ import org.tizen.dynamicanalyzer.ui.toolbar.StopLogProcessor; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; -import org.tizen.dynamicanalyzer.widgets.chart.DAChart; public class MessageParser { @@ -246,7 +245,7 @@ public class MessageParser { int index = 0; int id = ByteUtils.toInt(data, index); index += INT_SIZE; - int seq = ByteUtils.toInt(data, index); +// int seq = ByteUtils.toInt(data, index); index += INT_SIZE; DATime changeTime = new DATime(); int sec = ByteUtils.toInt(data, index); @@ -256,7 +255,7 @@ public class MessageParser { changeTime.setSec(sec); changeTime.setNano(nano); - int length = ByteUtils.toInt(data, index); +// int length = ByteUtils.toInt(data, index); index += INT_SIZE; int pid = ByteUtils.toInt(data, index); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java index eda553e..5f26c2f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java @@ -33,7 +33,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.eclipse.cdt.utils.debug.DebugField; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.tizen.dynamicanalyzer.common.AnalyzerPaths; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinaryAddDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinaryAddDialog.java index b0fcab0..37554fb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinaryAddDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinaryAddDialog.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.platform.ui; import java.io.BufferedReader; @@ -302,7 +328,7 @@ public class BinaryAddDialog extends DAMessageBox { data.height = 30; data.width = 80; findPackageButton.setLayoutData(data); - findPackageButton.setText("Find dir"); + findPackageButton.setText("Find file"); findPackageButton.addClickListener(findDebugButtonListener); Label sourceLabel = new Label(shell, SWT.TRANSPARENT); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java index 7795943..2cba73b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.platform.ui.DeviceExplorer; import org.eclipse.nebula.widgets.grid.Grid; @@ -39,7 +65,7 @@ public class DeviceExplorer extends Composite { protected Text inputText = null; protected DACustomButton goButton = null; protected Label info = null; - private boolean getDirectory = false; + private boolean bDirectory = false; private IDevice device = null; private FileEntry root = null; @@ -278,13 +304,13 @@ public class DeviceExplorer extends Composite { FileEntry entry = (FileEntry) selection .getData(ExplorerUtil.DATA_FIEL_KEY); if (entry.isDirectory() || entry.isRoot()) { - if (getDirectory) { + if (bDirectory) { return entry; } else { return null; } } else { - if (getDirectory) { + if (bDirectory) { return entry.getParent(); } else { return entry; @@ -296,7 +322,11 @@ public class DeviceExplorer extends Composite { } public void setReturnDirectory(boolean getDir) { - getDirectory = getDir; + bDirectory = getDir; + } + + public boolean isReturnDirectory() { + return bDirectory; } public void setDevice(IDevice dev) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java index 57cf29f..61a1c91 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.platform.ui.DeviceExplorer; import org.eclipse.nebula.widgets.grid.Grid; @@ -133,7 +159,8 @@ public class DeviceExplorerDilaog extends DAMessageBox { FileEntry entry = (FileEntry) item .getData(ExplorerUtil.DATA_FIEL_KEY); - if (!entry.isDirectory() && !entry.isRoot()) { + if (!entry.isDirectory() && !entry.isRoot() + && !explorer.isReturnDirectory()) { result = entry; shell.dispose(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java index 43957d5..b7a0b9c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.platform.ui; import java.io.File; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java index 3b6929d..8a6a7f8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer; import java.io.File; @@ -38,7 +64,7 @@ public class DAFileExplorer extends Composite { protected Text inputText = null; protected DACustomButton goButton = null; protected Label info = null; - private boolean getDirectory = false; + private boolean bDirectory = false; private File root = null; private File current = null; @@ -270,25 +296,33 @@ public class DAFileExplorer extends Composite { } File entry = (File) selection.getData(ExplorerUtil.DATA_FIEL_KEY); if (entry.isDirectory()) { - if (getDirectory) { + if (bDirectory) { return entry; } else { return null; } } else { - if (getDirectory) { + if (bDirectory) { return entry.getParentFile(); } else { return entry; } } } else { - return null; + if (bDirectory) { + return current; + } else { + return null; + } } } public void setReturnDirectory(boolean getDir) { - getDirectory = getDir; + bDirectory = getDir; + } + + public boolean isReturnDirectory() { + return bDirectory; } public int setCurrent(String path) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerEmptyCellRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerEmptyCellRenderer.java index 1f40961..6c4c0dd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerEmptyCellRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerEmptyCellRenderer.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer; import org.eclipse.nebula.widgets.grid.Grid; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerTableRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerTableRenderer.java index 023b71d..f0437fd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerTableRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorerTableRenderer.java @@ -1,3 +1,28 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ package org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer; import java.io.File; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/FileExplorerDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/FileExplorerDialog.java index d6b45a5..b333c78 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/FileExplorerDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/FileExplorerDialog.java @@ -1,6 +1,37 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ package org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer; +import java.io.File; + +import org.eclipse.nebula.widgets.grid.Grid; +import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.graphics.Rectangle; @@ -12,6 +43,7 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.DesignConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; +import org.tizen.dynamicanalyzer.swap.platform.ui.ExplorerUtil; import org.tizen.dynamicanalyzer.ui.widgets.DAButton; import org.tizen.dynamicanalyzer.ui.widgets.DAMessageBox; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; @@ -101,36 +133,36 @@ public class FileExplorerDialog extends DAMessageBox { protected boolean run() { explorer.updateData(); - // explorer.getTable().addMouseListener(new MouseListener() { - // - // @Override - // public void mouseUp(MouseEvent e) { - // // TODO Auto-generated method stub - // - // } - // - // @Override - // public void mouseDown(MouseEvent e) { - // // TODO Auto-generated method stub - // - // } - // - // @Override - // public void mouseDoubleClick(MouseEvent e) { - // Grid table = (Grid) e.widget; - // GridItem[] items = (GridItem[]) table.getSelection(); - // if (null == items || items.length == 0) { - // return; - // } - // GridItem item = items[0]; - // File entry = (File) item.getData(ExplorerUtil.DATA_FIEL_KEY); - // - // if (!entry.isDirectory()) { - // result = entry; - // shell.dispose(); - // } - // } - // }); + explorer.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseUp(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseDown(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseDoubleClick(MouseEvent e) { + Grid table = (Grid) e.widget; + GridItem[] items = (GridItem[]) table.getSelection(); + if (null == items || items.length == 0) { + return; + } + GridItem item = items[0]; + File entry = (File) item.getData(ExplorerUtil.DATA_FIEL_KEY); + + if (!entry.isDirectory() && !explorer.isReturnDirectory()) { + result = entry; + shell.dispose(); + } + } + }); return true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakData.java index ff8aabf..fa1aae0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakData.java @@ -32,7 +32,6 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.swap.model.data.MemoryData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class LeakData { public static final int INDEX_LEAK_SEQ = 1; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java index 596c28f..7adf901 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java @@ -30,11 +30,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class LeakDetector { @@ -163,74 +160,74 @@ public class LeakDetector { } } - private void checkUserFuncLeakData(LogData log, LeakInfo chk) { - HashMap cdMap = AnalyzerManager - .getCallstackManager().getCallStackDataBySeqMap(); - // HashMap apiMap = LogSpliter.getCallStackApiByAddrMap(); - HashMap addrMap = AnalyzerManager - .getCallstackManager().getCallStackApiByAddrMap(); - - if (null == cdMap || null == addrMap) { - return; - } - - int seqNum = log.getSeq(); - CallStackData csd = cdMap.get(seqNum); - if (null == csd) { - // System.out.println("no callstack "); //$NON-NLS-1$ - // for (int i = 0; i < input.length; i++) - // { - // System.out.print(input[i] + " "); //$NON-NLS-1$ - // } - // System.out.println(); - return; - } - List addrs = null; - addrs = csd.getAddrs(); - if (addrs.isEmpty()) { - System.out.println("BUG: Callstack is empty!"); //$NON-NLS-1$ - return; - } - - CallStackUnit callerFunc = addrMap.get(addrs.get(0)); - - // user call - if (AnalyzerManager.getCallstackManager().isUserCall( - callerFunc.getFunctionName())) { - HashMap leaks = getLeakHash(); - LeakData newLeak = new LeakData(log, this); - leaks.put(newLeak.getKey(), newLeak); - } - // for internal leak - // else { - // undefined internal call - // int size = addrs.size(); - // for (int i = 1; i < size; i++) { - // callerFunc = addrMap.get(addrs.get(i)); - // if (callerFunc.getFunctionName().contains("__dlog_print")) { //$NON-NLS-1$ - // return; - // } - // if (CallStackManager.getInstance().isUserCall( - // callerFunc.getFunctionName())) { - // LeakData childData = new LeakData(input[chk.getKeyIndex()], - // input); - // String addr = Long.toString(addrs.get(i - 1)); - // callerFunc = addrMap.get(addrs.get(i - 1)); - // LeakData parentLeakData = getLeakHash().get(addr); - // if (null == parentLeakData) { - // parentLeakData = new LeakData(addr, - // callerFunc.getSymbol(), - // input[LogCenterConstants.ID_INDEX]); - // getLeakHash().put(addr, parentLeakData); - // } - // parentLeakData.addChild(childData); - // childData.setParentKey(parentLeakData.getKey()); - // getChildHash().put(childData.getKey(), childData); - // break; - // } - // } - // } - } + // private void checkUserFuncLeakData(LogData log, LeakInfo chk) { + // HashMap cdMap = AnalyzerManager + // .getCallstackManager().getCallStackDataBySeqMap(); + // // HashMap apiMap = LogSpliter.getCallStackApiByAddrMap(); + // HashMap addrMap = AnalyzerManager + // .getCallstackManager().getCallStackApiByAddrMap(); + // + // if (null == cdMap || null == addrMap) { + // return; + // } + // + // int seqNum = log.getSeq(); + // CallStackData csd = cdMap.get(seqNum); + // if (null == csd) { + // // System.out.println("no callstack "); //$NON-NLS-1$ + // // for (int i = 0; i < input.length; i++) + // // { + // // System.out.print(input[i] + " "); //$NON-NLS-1$ + // // } + // // System.out.println(); + // return; + // } + // List addrs = null; + // addrs = csd.getAddrs(); + // if (addrs.isEmpty()) { + // System.out.println("BUG: Callstack is empty!"); //$NON-NLS-1$ + // return; + // } + // + // CallStackUnit callerFunc = addrMap.get(addrs.get(0)); + // + // // user call + // if (AnalyzerManager.getCallstackManager().isUserCall( + // callerFunc.getFunctionName())) { + // HashMap leaks = getLeakHash(); + // LeakData newLeak = new LeakData(log, this); + // leaks.put(newLeak.getKey(), newLeak); + // } + // for internal leak + // else { + // undefined internal call + // int size = addrs.size(); + // for (int i = 1; i < size; i++) { + // callerFunc = addrMap.get(addrs.get(i)); + // if (callerFunc.getFunctionName().contains("__dlog_print")) { //$NON-NLS-1$ + // return; + // } + // if (CallStackManager.getInstance().isUserCall( + // callerFunc.getFunctionName())) { + // LeakData childData = new LeakData(input[chk.getKeyIndex()], + // input); + // String addr = Long.toString(addrs.get(i - 1)); + // callerFunc = addrMap.get(addrs.get(i - 1)); + // LeakData parentLeakData = getLeakHash().get(addr); + // if (null == parentLeakData) { + // parentLeakData = new LeakData(addr, + // callerFunc.getSymbol(), + // input[LogCenterConstants.ID_INDEX]); + // getLeakHash().put(addr, parentLeakData); + // } + // parentLeakData.addChild(childData); + // childData.setParentKey(parentLeakData.getKey()); + // getChildHash().put(childData.getKey(), childData); + // break; + // } + // } + // } + // } public int getLeakSeq() { return leakSeq; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java index 555c115..a6c8ece 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java @@ -38,7 +38,6 @@ import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.swap.model.data.ThreadData; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/UserFunctionManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/UserFunctionManager.java deleted file mode 100644 index fa7ec96..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/UserFunctionManager.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * WooJin Jung - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.ui.timeline.calltrace; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; - -public class UserFunctionManager { -// private List log = null; -// private static UserFunctionManager instance = null; -// private int count = 0; -// public static boolean stop = false; -// private HashMap entryMap = new HashMap(); -// -// public static UserFunctionManager getInstance() { -// if (null == instance) { -// instance = new UserFunctionManager(); -// } -// return instance; -// } -// -// public void clear() { -// instance = null; -// stop = false; -// } -// -// public List getLog() { -// if (null == log) { -// log = new ArrayList(); -// } -// return log; -// } -// -// public void setReturnValue(LogData input) { -// ProfileData exitData = (ProfileData) input; -// long addr = exitData.getPcAddr(); -//// System.out.println(input.getId() + " exit addr : " -//// + AnalyzerUtil.toHexdecimal(addr) + " api : " + exitData.getApiName()); -// ProfileData entryData = (ProfileData) entryMap.get(addr); -// if (null != entryData) { -//// System.out.println("SET RETURN! " + AnalyzerUtil.toHexdecimal(addr) -//// + " value : " + exitData.getRet()); -// entryData.setRet(exitData.getRet()); -// entryMap.remove(addr); -// } -// -// } -// -// public void addLog(LogData input) { -// // TODO:UserFunction case -// if (!stop) { -// ProfileData entryData = (ProfileData) input; -// getLog().add(entryData); -// entryMap.put(entryData.getPcAddr(), entryData); -//// System.out.println("PUT : " -//// + AnalyzerUtil.toHexdecimal(entryData.getPcAddr())+ " api : " + entryData.getApiName()); -// count++; -// if (count >= 1000) { -// stop = true; -// } -// } -// } -} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java index 27fdcf8..211ea70 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.ui.toolbar.configuration; import java.io.BufferedReader; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java index aa9d173..09225f0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java @@ -5,6 +5,7 @@ * * Contact: * HyunJong Park + * Jooyoul Lee * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -197,17 +198,6 @@ public class ConfigurationDialog extends DAMessageBox { buttonData.height = 28; cancelButton.setLayoutData(buttonData); - // okButton = new DAButton(buttonContentsComp, SWT.NONE); - // okButton.addClickListener(okButtonListener); - // okButton.setText(AnalyzerLabels.OK); - // okButton.setFont(FontResources.DIALOG_BUTTON_FONT); - // buttonData = new FormData(); - // buttonData.right = new FormAttachment(50, -4); - // buttonData.top = new FormAttachment(0, 11); - // buttonData.width = 100; - // buttonData.height = 28; - // okButton.setLayoutData(buttonData); - applyButton = new DAButton(buttonContentsComp, SWT.NONE); applyButton.addClickListener(applyButtonListener); applyButton.setText(AnalyzerLabels.APPLY); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/XMLManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/XMLManager.java deleted file mode 100644 index b1eb767..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/XMLManager.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ -package org.tizen.dynamicanalyzer.utils; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - -public class XMLManager { - private static final String DATA_MODEL_NAME_SPACE = "org.tizen.dynamicanalyzer.model"; //$NON-NLS-1$ - - @SuppressWarnings("static-access") - public static void marshal(Object obj, File path) { - if (null == path || null == obj) { - return; - } - - try { - JAXBContext jc = JAXBContext.newInstance(DATA_MODEL_NAME_SPACE); - Marshaller marshaller = jc.createMarshaller(); - marshaller.setProperty(marshaller.JAXB_FORMATTED_OUTPUT, - Boolean.TRUE); - marshaller.marshal(obj, new FileOutputStream(path)); - } catch (JAXBException e) { - e.printStackTrace(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - } - - public static Object unmarshal(File path) { - if (null == path) { - return null; - } - - try { - JAXBContext jc = JAXBContext.newInstance(DATA_MODEL_NAME_SPACE); - Unmarshaller u = jc.createUnmarshaller(); - return u.unmarshal(new FileInputStream(path)); - } catch (JAXBException e) { - e.printStackTrace(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - return null; - } -} -- 2.7.4