From: JinWang An <jinwang.an@samsung.com>
Date: Mon, 24 Feb 2020 01:38:07 +0000 (+0900)
Subject: Remove exclusive type
X-Git-Tag: submit/tizen/20200319.043412~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdc99a97dfa5a0412bf30719ea07c958387906a2;p=platform%2Fcore%2Fsystem%2Fmodes.git

Remove exclusive type
---

diff --git a/example/mode/tizen_asyncValidErr_mode.xml b/example/mode/tizen_asyncValidErr_mode.xml
index 763c8ff..9ef4ab3 100644
--- a/example/mode/tizen_asyncValidErr_mode.xml
+++ b/example/mode/tizen_asyncValidErr_mode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="async_valied" type="exclusive" hidden="true">
-    <action rule="test.sleepErrorReturn" stopOnErr="true" type="async">5</action>
+  <mode name="async_valied" type="normal" hidden="true">
+    <action rule="test.sleepErrorReturn" restrict="lock" stopOnErr="true" type="async">5</action>
   </mode>
 </tizenModes>
diff --git a/example/mode/tizen_conflictErrExclusive_mode.xml b/example/mode/tizen_conflictErrExclusive_mode.xml
index 43cb35b..b4d7858 100644
--- a/example/mode/tizen_conflictErrExclusive_mode.xml
+++ b/example/mode/tizen_conflictErrExclusive_mode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="conflict3" type="exclusive">
+  <mode name="conflict3" type="normal">
     <action ID="test" rule="test.printBool" restrict="lock">true</action>
   </mode>
 </tizenModes>
diff --git a/example/mode/tizen_invalidValErr1_mode.xml b/example/mode/tizen_invalidValErr1_mode.xml
index c34416b..134df11 100644
--- a/example/mode/tizen_invalidValErr1_mode.xml
+++ b/example/mode/tizen_invalidValErr1_mode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="invalid1" type="exclusive">
-    <action rule="test.printBool">123</action>
+  <mode name="invalid1" type="normal">
+    <action rule="test.printBool" restrict="lock">123</action>
   </mode>
 </tizenModes>
diff --git a/example/mode/tizen_invalidValErr2_mode.xml b/example/mode/tizen_invalidValErr2_mode.xml
index 374eef1..0078fff 100644
--- a/example/mode/tizen_invalidValErr2_mode.xml
+++ b/example/mode/tizen_invalidValErr2_mode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="invalid2" type="exclusive">
-    <action rule="test.printInt">PRINT_TREE</action>
+  <mode name="invalid2" type="normal">
+    <action rule="test.printInt" restrict="lock">PRINT_TREE</action>
   </mode>
 </tizenModes>
diff --git a/example/mode/tizen_normalEx2_mode.xml b/example/mode/tizen_normalEx2_mode.xml
index e062a21..22614f1 100644
--- a/example/mode/tizen_normalEx2_mode.xml
+++ b/example/mode/tizen_normalEx2_mode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="ex2" type="exclusive" hidden="true">
+  <mode name="ex2" type="normal" hidden="true">
     <action ID="1" rule="test.printInt" stopOnErr="true" restrict="lock" priority="-100">PRINT_FOUR</action>
     <action ID="wifiOff" rule="test.printBool" restrict="lock" priority="-100">off</action>
   </mode>
diff --git a/include/modes_constants.h b/include/modes_constants.h
index a8cdfb1..e74e18e 100644
--- a/include/modes_constants.h
+++ b/include/modes_constants.h
@@ -43,8 +43,6 @@
 typedef enum {
 	MODES_TYPE_MODE_NORMAL = 0, /**< Indicates normal mode that is allowed to undo and apply other mode  */
 	MODES_TYPE_MODE_ONESHOT = (1 << 0), /**< Indicates one-shot mode that has no management(undo) */
-	// Exclusive is not valide type on making by user.
-	//MODES_TYPE_MODE_EXCLUSIVE = (1 << 1), /**< Indicates exclusive mode that is only allowed to undo */
 } modes_type_mode_e;
 
 
diff --git a/schema/tizen_mode.xsd b/schema/tizen_mode.xsd
index 9f48f1f..3692d82 100644
--- a/schema/tizen_mode.xsd
+++ b/schema/tizen_mode.xsd
@@ -52,7 +52,6 @@
     <xs:restriction base="xs:string">
       <xs:enumeration value="normal"/>
       <xs:enumeration value="oneshot"/>
-      <xs:enumeration value="exclusive"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/supervisor/ConflictManager.cpp b/supervisor/ConflictManager.cpp
index be93fd1..599072c 100644
--- a/supervisor/ConflictManager.cpp
+++ b/supervisor/ConflictManager.cpp
@@ -28,7 +28,7 @@ ConflictManager::ConflictManager(ModeCareTaker &careTaker)
 
 bool ConflictManager::isConflict(const Mode &mode)
 {
-	if (careTaker.isSavedMode(mode.getName()) || careTaker.isExclusive())
+	if (careTaker.isSavedMode(mode.getName()))
 		return true;
 
 	if (careTaker.checkConflictAction(mode))
diff --git a/supervisor/Mode.h b/supervisor/Mode.h
index 60f9d1a..c22a838 100644
--- a/supervisor/Mode.h
+++ b/supervisor/Mode.h
@@ -28,7 +28,6 @@ public:
 	typedef enum {
 		MODE_NORMAL,
 		MODE_ONESHOT,
-		MODE_EXCLUSIVE
 	} ModeType;
 
 	Mode();
diff --git a/supervisor/ModeCareTaker.cpp b/supervisor/ModeCareTaker.cpp
index 76c0675..3e7c710 100644
--- a/supervisor/ModeCareTaker.cpp
+++ b/supervisor/ModeCareTaker.cpp
@@ -22,7 +22,7 @@
 MODES_NAMESPACE_USE;
 
 ModeCareTaker::ModeCareTaker()
-	: undoDir(MODES_UNDO_INFO_DEFAULT_DIR), exclusive(false)
+	: undoDir(MODES_UNDO_INFO_DEFAULT_DIR)
 {
 }
 
@@ -34,13 +34,11 @@ void ModeCareTaker::setOptions(const std::string &undoInfoDir)
 void ModeCareTaker::restoreMode(const Mode &mode)
 {
 	savedModes.insert(std::pair<std::string, Mode>(mode.getName(), mode));
-	exclusive = (Mode::MODE_EXCLUSIVE == mode.getModeType());
 }
 
 void ModeCareTaker::pushMode(const Mode &mode)
 {
 	savedModes.insert(std::pair<std::string, Mode>(mode.getName(), mode));
-	exclusive = (Mode::MODE_EXCLUSIVE == mode.getModeType());
 
 	if (mode.hasEssential())
 		handleEssentialAction(mode);
@@ -69,9 +67,6 @@ int ModeCareTaker::popMode(const std::string &name, Mode &mode)
 	}
 
 	mode = found->second;
-	if (Mode::MODE_EXCLUSIVE == mode.getModeType())
-		exclusive = false;
-
 	savedModes.erase(found);
 
 	return MODES_ERROR_NONE;
@@ -88,13 +83,6 @@ bool ModeCareTaker::isSavedMode(const std::string &name)
 	return false;
 }
 
-bool ModeCareTaker::isExclusive()
-{
-	if (exclusive)
-		ERR("exclusive Mode is applied");
-	return exclusive;
-}
-
 bool ModeCareTaker::findLockedAction(const std::string &ruleName)
 {
 	for (auto modeIt = savedModes.begin(); modeIt != savedModes.end(); modeIt++) {
diff --git a/supervisor/ModeCareTaker.h b/supervisor/ModeCareTaker.h
index c5ed7fe..7803dbf 100644
--- a/supervisor/ModeCareTaker.h
+++ b/supervisor/ModeCareTaker.h
@@ -33,7 +33,6 @@ public:
 	void pushMode(const Mode &mode);
 	int popMode(const std::string &name, Mode &mode);
 	bool isSavedMode(const std::string &name);
-	bool isExclusive();
 	bool checkConflictAction(const Mode &mode);
 	void update(const std::string &rule);
 private:
@@ -42,7 +41,6 @@ private:
 	std::map<std::string, Mode> savedModes;
 	std::multimap<std::string, std::string> essentialMap;
 	std::string undoDir;
-	bool exclusive;
 };
 
 MODES_NAMESPACE_END
diff --git a/supervisor/ModeXMLParser.cpp b/supervisor/ModeXMLParser.cpp
index f20aecd..06eb4b5 100644
--- a/supervisor/ModeXMLParser.cpp
+++ b/supervisor/ModeXMLParser.cpp
@@ -153,8 +153,6 @@ Mode::ModeType ModeXMLParser::extractModeType(xmlNodePtr node)
 	Mode::ModeType type;
 	if ("normal" == val)
 		type = Mode::MODE_NORMAL;
-	else if ("exclusive" == val)
-		type = Mode::MODE_EXCLUSIVE;
 	else
 		type = Mode::MODE_ONESHOT;
 	return type;
diff --git a/supervisor/XMLGenerator.cpp b/supervisor/XMLGenerator.cpp
index a99d27f..9d7ae97 100644
--- a/supervisor/XMLGenerator.cpp
+++ b/supervisor/XMLGenerator.cpp
@@ -60,8 +60,6 @@ const std::string XMLGenerator::getModeTypeStr(Mode::ModeType t)
 	switch (t) {
 	case Mode::MODE_ONESHOT:
 		return "oneshot";
-	case Mode::MODE_EXCLUSIVE:
-		return "exclusive";
 	case Mode::MODE_NORMAL:
 	default:
 		return "normal";
diff --git a/unittest/modes_test_client.cpp b/unittest/modes_test_client.cpp
index 4b9a61f..9c4d6e1 100644
--- a/unittest/modes_test_client.cpp
+++ b/unittest/modes_test_client.cpp
@@ -114,16 +114,6 @@ TEST_F(ClientTest, canApplyModeN)
 	EXPECT_EQ(MODES_ERROR_NO_DATA, ret);
 }
 
-TEST_F(ClientTest, canApplyModeConflictExclusive)
-{
-	modes_undo_mode(handle, "ex2");
-	g_idle_add(applyModeIdler, (gpointer)"ex2");
-	g_main_loop_run(loop);
-	int ret = modes_can_apply(handle, "ex1");
-	EXPECT_EQ(MODES_ERROR_CONFLICT, ret);
-	modes_undo_mode(handle, "ex2");
-}
-
 TEST_F(ClientTest, registerMode)
 {
 	g_idle_add(registerModeIdler, NULL);
@@ -149,10 +139,9 @@ TEST_F(ClientTest, undoModeEx2)
 
 TEST_F(ClientTest, getModes)
 {
-const char* const typeList[3] = {
+const char* const typeList[2]= {
 		"MODES_TYPE_MODE_NORMAL",
-		"MODES_TYPE_MODE_ONESHOT",
-		"MODES_TYPE_MODE_EXCLUSIVE"
+		"MODES_TYPE_MODE_ONESHOT"
 	};
 
 	GList *list, *cur;
diff --git a/unittest/modes_test_conflict.cpp b/unittest/modes_test_conflict.cpp
index c729744..f98a592 100644
--- a/unittest/modes_test_conflict.cpp
+++ b/unittest/modes_test_conflict.cpp
@@ -62,18 +62,6 @@ TEST_F(ConflictTest, isSavedMode)
 	EXPECT_TRUE(careTaker.isSavedMode(modeparser.getModeName()));
 }
 
-TEST_F(ConflictTest, isExclusive)
-{
-	ModeXMLParser modeparser("tizen_conflictErrExclusive_mode.xml", ruleMgr);
-
-	careTaker.pushMode(modeparser.getMode());
-	EXPECT_TRUE(careTaker.isExclusive());
-
-	Mode mode;
-	careTaker.popMode(modeparser.getModeName(), mode);
-	EXPECT_FALSE(careTaker.isExclusive());
-}
-
 TEST_F(ConflictTest, checkConflictAction)
 {
 	ModeXMLParser modeparser("tizen_conflictErr_mode.xml", ruleMgr);