From: hyunsik.noh <hyunsik.noh@samsung.com>
Date: Thu, 8 Dec 2011 04:30:54 +0000 (+0900)
Subject: [Title] fix log tab filter 'or' option
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=615c9ab712cab0372fc6297f8f0052bf162d2b16;p=sdk%2Fide%2Fcommon-eplugin.git

[Title] fix log tab filter 'or' option
fix combo filter work without text modified
[Type] Enhancement
[Module] common
[Priority] Minor
---

diff --git a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogPanel.java b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogPanel.java
index 215384d..f60a660 100644
--- a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogPanel.java
+++ b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogPanel.java
@@ -36,6 +36,7 @@ import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
@@ -71,6 +72,7 @@ public class LogPanel extends Panel implements IDeviceChangeListener {
 
 	private Composite parent;
 	private TabFolder folders;
+	private Text filterText;
 
 	private LogColors colors;
 	/**
@@ -316,8 +318,21 @@ public class LogPanel extends Panel implements IDeviceChangeListener {
 		combo.setItems(comboItems);
 		combo.select(2);
 		combo.setToolTipText("Keyword Search: Pid or Tag, Message");
-
-		final Text filterText = new Text(bottom, SWT.SINGLE | SWT.BORDER);
+		combo.addSelectionListener(new SelectionListener() {
+		      public void widgetSelected(SelectionEvent e) {
+		    	  if(filterText.getText() != null)
+		    	  {
+		    		  tab.setFilterMode((int) Math.pow(2, combo.getSelectionIndex()));
+		    		  tab.setFilterWord(filterText.getText());
+		    		  tab.refill();
+		    	  }
+		        }
+
+		        public void widgetDefaultSelected(SelectionEvent e) {
+		        }
+		      });
+
+		filterText = new Text(bottom, SWT.SINGLE | SWT.BORDER);
 		filterText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		filterText.setMessage(" Input Keyword ");
 		filterText.addModifyListener(new ModifyListener() {
diff --git a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogTab.java b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogTab.java
index 27589f6..8ea3f42 100644
--- a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogTab.java
+++ b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/log/LogTab.java
@@ -349,21 +349,22 @@ public class LogTab {
 		}
 
 		if (filterMode != FILTER_NONE && filterWord != null) {
-			if ((filterMode & FILTER_PID) != 0) {
-				if (!Integer.toString(logMessage.data.pid).contains(filterWord))
-					return false;
+			if ((filterMode & FILTER_PID) == FILTER_PID) {
+				if (Integer.toString(logMessage.data.pid).contains(filterWord))
+					return true;
 			}
 
-			if ((filterMode & FILTER_TAG) != 0) {
-				if (!logMessage.data.tag.toLowerCase().contains(filterWord.toLowerCase()))
-					return false;
+			if ((filterMode & FILTER_TAG) == FILTER_TAG) {
+				if (logMessage.data.tag.toLowerCase().contains(filterWord.toLowerCase()))
+					return true;
 			}
 
-			if ((filterMode & FILTER_MSG) != 0) {
-				if (!logMessage.msg.toLowerCase().contains(
+			if ((filterMode & FILTER_MSG) == FILTER_MSG) {
+				if (logMessage.msg.toLowerCase().contains(
 						filterWord.toLowerCase()))
-					return false;
+					return true;
 			}
+			return false;
 		}
 		return true;
 	}