Changeset 378

Timestamp:

09/12/11 10:03:34 (8 months ago)

Author:

Carsten

Message:

Gui Editor:
Renamed and "templatized" class CommandSetStringsT to CommandSetWinPropT in order to make it reusable with ints and floats as well.

Location:

cafu/trunk/CaWE/GuiEditor

Files:

• Commands/SetWinProp.cpp (moved) (moved from cafu/trunk/CaWE/GuiEditor/Commands/SetStrings.cpp) (3 diffs)
• Commands/SetWinProp.hpp (moved) (moved from cafu/trunk/CaWE/GuiEditor/Commands/SetStrings.hpp) (3 diffs)
• Windows/EditorChoiceWindow.cpp (modified) (2 diffs)

cafu/trunk/CaWE/GuiEditor/Commands/SetWinProp.cpp

@@ -20 +20 @@
 */
 
-#include "SetStrings.hpp"
+#include "SetWinProp.hpp"
 #include "../GuiDocument.hpp"
 
@@ -27 +27 @@
 
 
-CommandSetStringsT::CommandSetStringsT(GuiDocumentT* GuiDoc, const EditorWindowT* Win, const wxString& PropertyName,
-    ArrayT<std::string>& Strings, const ArrayT<std::string>& NewStrings)
+template<class T>
+CommandSetWinPropT<T>::CommandSetWinPropT(GuiDocumentT* GuiDoc, const EditorWindowT* Win, const wxString& PropName, T& Value, const T& NewValue)
     : m_GuiDoc(GuiDoc),
       m_Win(Win),
-      m_PropertyName(PropertyName),
-      m_Strings(Strings),
-      m_NewStrings(NewStrings),
-      m_OldStrings(Strings)
+      m_PropName(PropName),
+      m_Value(Value),
+      m_NewValue(NewValue),
+      m_OldValue(Value)
 {
 }
 
 
-bool CommandSetStringsT::Do()
+template<class T>
+bool CommandSetWinPropT<T>::Do()
 {
     wxASSERT(!m_Done);
     if (m_Done) return false;
 
-    // If the next sequence didn't really change, don't put this command into the command history.
-    // if (m_NewNext==m_OldNext) return false;
+    // If the new value isn't different from the old, don't put this command into the command history.
+    // if (m_NewValue==m_OldValue) return false;
 
-    m_Strings=m_NewStrings;
+    m_Value=m_NewValue;
 
-    m_GuiDoc->UpdateAllObservers_Modified(m_Win, m_PropertyName);
+    m_GuiDoc->UpdateAllObservers_Modified(m_Win, m_PropName);
     m_Done=true;
     return true;
@@ -55 +56 @@
 
 
-void CommandSetStringsT::Undo()
+template<class T>
+void CommandSetWinPropT<T>::Undo()
 {
     wxASSERT(m_Done);
     if (!m_Done) return;
 
-    m_Strings=m_OldStrings;
+    m_Value=m_OldValue;
 
-    m_GuiDoc->UpdateAllObservers_Modified(m_Win, m_PropertyName);
+    m_GuiDoc->UpdateAllObservers_Modified(m_Win, m_PropName);
     m_Done=false;
 }
 
 
-wxString CommandSetStringsT::GetName() const
+template<class T>
+wxString CommandSetWinPropT<T>::GetName() const
 {
-    return "Set strings for " + m_PropertyName;
+    return "Set " + m_PropName;
 }
+
+
+template class CommandSetWinPropT< ArrayT<std::string> >;

cafu/trunk/CaWE/GuiEditor/Commands/SetWinProp.hpp

@@ -20 +20 @@
 */
 
-#ifndef _GUIEDITOR_SET_STRINGS_HPP_
-#define _GUIEDITOR_SET_STRINGS_HPP_
+#ifndef _GUIEDITOR_SET_WINDOW_PROPERTY_HPP_
+#define _GUIEDITOR_SET_WINDOW_PROPERTY_HPP_
 
 #include "../../CommandPattern.hpp"
@@ -31 +31 @@
     class EditorWindowT;
 
-    class CommandSetStringsT : public CommandT
+    template<class T>
+    class CommandSetWinPropT : public CommandT
     {
         public:
 
-        CommandSetStringsT(GuiDocumentT* GuiDoc, const EditorWindowT* Win, const wxString& PropertyName,
-            ArrayT<std::string>& Strings, const ArrayT<std::string>& NewStrings);
+        CommandSetWinPropT(GuiDocumentT* GuiDoc, const EditorWindowT* Win, const wxString& PropName, T& Value, const T& NewValue);
 
         // CommandT implementation.
@@ -46 +46 @@
         private:
 
-        GuiDocumentT*             m_GuiDoc;
-        const EditorWindowT*      m_Win;
-        const wxString            m_PropertyName;
-        ArrayT<std::string>&      m_Strings;
-        const ArrayT<std::string> m_NewStrings;
-        const ArrayT<std::string> m_OldStrings;
+        GuiDocumentT*        m_GuiDoc;
+        const EditorWindowT* m_Win;
+        const wxString       m_PropName;
+        T&                   m_Value;
+        const T              m_NewValue;
+        const T              m_OldValue;
     };
 }

cafu/trunk/CaWE/GuiEditor/Windows/EditorChoiceWindow.cpp

@@ -24 +24 @@
 #include "../GuiDocument.hpp"
 #include "../Commands/ModifyWindow.hpp"
-#include "../Commands/SetStrings.hpp"
+#include "../Commands/SetWinProp.hpp"
 
 #include "GuiSys/WindowChoice.hpp"
@@ -104 +104 @@
             NewStrings.PushBack(std::string(Tokenizer.GetNextToken()));
 
-        ChildFrame->SubmitCommand(new CommandSetStringsT(m_GuiDoc, this, PropName, m_Choice->m_Choices, NewStrings));
+        ChildFrame->SubmitCommand(new CommandSetWinPropT< ArrayT<std::string> >(m_GuiDoc, this, PropName, m_Choice->m_Choices, NewStrings));
         return true;
     }