dia r4195 - in trunk: . objects/AADL objects/Jackson objects/KAOS objects/UML

From: hans svn gnome org
To: svn-commits-list gnome org
Subject: dia r4195 - in trunk: . objects/AADL objects/Jackson objects/KAOS objects/UML
Date: Sat, 17 Jan 2009 14:00:59 +0000 (UTC)
Author: hans
Date: Sat Jan 17 14:00:59 2009
New Revision: 4195
URL: http://svn.gnome.org/viewvc/dia?rev=4195&view=rev

Log:
2009-01-17  Hans Breuer  <hans breuer org>

	* objects/UML/classicon.c objects/UML/implements.c 
	  objects/UML/message.c objects/UML/node.c
	  objects/AADL/aadlbox.c objects/Jackson/phenomenon.c
	  objects/KAOS/metaandorrel.c : reverted part of revision 3958 
	"same name, same type", nowadays I'm weighting forward-compatibility 
	higher than following unwritten rules



Modified:
   trunk/ChangeLog
   trunk/objects/AADL/aadlbox.c
   trunk/objects/Jackson/phenomenon.c
   trunk/objects/KAOS/metaandorrel.c
   trunk/objects/UML/classicon.c
   trunk/objects/UML/implements.c
   trunk/objects/UML/message.c
   trunk/objects/UML/node.c

Modified: trunk/objects/AADL/aadlbox.c
==============================================================================
--- trunk/objects/AADL/aadlbox.c	(original)
+++ trunk/objects/AADL/aadlbox.c	Sat Jan 17 14:00:59 2009
@@ -153,10 +153,7 @@
   PROP_STD_TEXT_FONT,
   PROP_STD_TEXT_HEIGHT,
   PROP_STD_TEXT_COLOUR_OPTIONAL,
-  /* backward compatibility */
-  { "name", PROP_TYPE_TEXT, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Text"), NULL, NULL }, 
-  /* new name matching "same name, same type"  rule */
-  { "text", PROP_TYPE_TEXT, PROP_FLAG_OPTIONAL, N_("Text"), NULL, NULL },
+  { "name", PROP_TYPE_TEXT, 0, N_("Text"), NULL, NULL },
   PROP_DESC_END
 };
 
@@ -175,10 +172,7 @@
   {"declaration",PROP_TYPE_STRING,offsetof(Aadlbox,declaration)},
   {"line_colour",PROP_TYPE_COLOUR,offsetof(Aadlbox,line_color)},
   {"fill_colour",PROP_TYPE_COLOUR,offsetof(Aadlbox,fill_color)},
-  /* backward compatibility */
   {"name",PROP_TYPE_TEXT,offsetof(Aadlbox,name)},
-  /* new name matching "same name, same type"  rule */
-  {"text",PROP_TYPE_TEXT,offsetof(Aadlbox,name)},
   {"text_font",PROP_TYPE_FONT,offsetof(Aadlbox,attrs.font)},
   {PROP_STDNAME_TEXT_HEIGHT, PROP_STDTYPE_TEXT_HEIGHT,offsetof(Aadlbox,attrs.height)},
   {"text_colour",PROP_TYPE_COLOUR,offsetof(Aadlbox,attrs.color)},

Modified: trunk/objects/Jackson/phenomenon.c
==============================================================================
--- trunk/objects/Jackson/phenomenon.c	(original)
+++ trunk/objects/Jackson/phenomenon.c	Sat Jan 17 14:00:59 2009
@@ -140,10 +140,8 @@
 
 static PropDescription message_props[] = {
   CONNECTION_COMMON_PROPERTIES,
-  /* backward compatibility */
-  { "text", PROP_TYPE_STRING, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Message:"), NULL, NULL },
-  /* new name matching "same name, same type"  rule */
-  { "name", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Message:"), NULL, NULL },
+  { "text", PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+    N_("Message:"), NULL, NULL },
   { "type", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE|PROP_FLAG_NO_DEFAULTS,
     N_("Type:"), NULL, prop_message_type_data },
   { "text_pos", PROP_TYPE_POINT, 0,
@@ -162,10 +160,7 @@
 
 static PropOffset message_offsets[] = {
   CONNECTION_COMMON_PROPERTIES_OFFSETS,
-  /* backward compatibility */
   { "text", PROP_TYPE_STRING, offsetof(Message, text) },
-  /* new name matching "same name, same type"  rule */
-  { "name", PROP_TYPE_STRING, offsetof(Message, text) },
   { "type", PROP_TYPE_ENUM, offsetof(Message, type) },
   { "text_pos", PROP_TYPE_POINT, offsetof(Message,text_pos) },
   { NULL, 0, 0 }

Modified: trunk/objects/KAOS/metaandorrel.c
==============================================================================
--- trunk/objects/KAOS/metaandorrel.c	(original)
+++ trunk/objects/KAOS/metaandorrel.c	Sat Jan 17 14:00:59 2009
@@ -159,10 +159,8 @@
 
 static PropDescription maor_props[] = {
   CONNECTION_COMMON_PROPERTIES,
-  /* backward compatibility */
-  { "text", PROP_TYPE_STRING, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Text:"), NULL, NULL },
-  /* new name matching "same name, same type"  rule */
-  { "name", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Text:"), NULL, NULL },
+  { "text", PROP_TYPE_STRING, PROP_FLAG_VISIBLE,
+    N_("Text:"), NULL, NULL },
 
   { "type", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE|PROP_FLAG_NO_DEFAULTS,
     N_("Type:"), NULL, prop_maor_type_data },
@@ -183,10 +181,7 @@
 
 static PropOffset maor_offsets[] = {
   CONNECTION_COMMON_PROPERTIES_OFFSETS,
-  /* backward compatibility */
   { "text", PROP_TYPE_STRING, offsetof(Maor, text) },
-  /* new name matching "same name, same type"  rule */
-  { "name", PROP_TYPE_STRING, offsetof(Maor, text) },
   { "type", PROP_TYPE_ENUM, offsetof(Maor,type)},
   { "text_pos", PROP_TYPE_POINT, offsetof(Maor,text_pos) },
   { NULL, 0, 0 }

Modified: trunk/objects/UML/classicon.c
==============================================================================
--- trunk/objects/UML/classicon.c	(original)
+++ trunk/objects/UML/classicon.c	Sat Jan 17 14:00:59 2009
@@ -136,10 +136,11 @@
   ELEMENT_COMMON_PROPERTIES,
   PROP_STD_LINE_COLOUR_OPTIONAL, 
   PROP_STD_FILL_COLOUR_OPTIONAL, 
-  /* backward compatibility */
-  { "stereotype", PROP_TYPE_ENUM, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Stereotype"), NULL,  prop_classicon_type_data},
-  /* one name, one type */
-  { "type", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Stereotype"), NULL,  prop_classicon_type_data},
+  /* how it used to be before 0.96+SVN */
+  { "stereotype", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Stereotype"), NULL,  prop_classicon_type_data},
+  /* one name, one type: but breaks forward-compatibiliy so kind of reverted */
+  { "type", PROP_TYPE_ENUM, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY||PROP_FLAG_OPTIONAL, N_("Stereotype"), NULL,  prop_classicon_type_data},
+  
   { "is_object", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
   N_("Is object"), NULL, NULL },
   PROP_STD_TEXT_FONT,

Modified: trunk/objects/UML/implements.c
==============================================================================
--- trunk/objects/UML/implements.c	(original)
+++ trunk/objects/UML/implements.c	Sat Jan 17 14:00:59 2009
@@ -127,10 +127,11 @@
   PROP_STD_LINE_COLOUR_OPTIONAL, 
   /* can't use PROP_STD_TEXT_COLOUR_OPTIONAL cause it has PROP_FLAG_DONT_SAVE. It is designed to fill the Text object - not some subset */
   PROP_STD_TEXT_COLOUR_OPTIONS(PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD|PROP_FLAG_OPTIONAL),
-  /* backward compatibility */
-  { "text", PROP_TYPE_STRING, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Interface:"), NULL, NULL },
-  /* new name matching "same name, same type"  rule */
-  { "name", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Interface:"), NULL, NULL },
+  /* how it used to be before 0.96+SVN */
+  { "text", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Interface:"), NULL, NULL },
+  /* new name matching "same name, same type"  rule - reverted, forward compatibility seems more important */
+  { "name", PROP_TYPE_STRING, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Interface:"), NULL, NULL },
+
   { "text_pos", PROP_TYPE_POINT, 0, NULL, NULL, NULL },
   { "diameter", PROP_TYPE_REAL, 0, NULL, NULL, NULL },
   PROP_DESC_END

Modified: trunk/objects/UML/message.c
==============================================================================
--- trunk/objects/UML/message.c	(original)
+++ trunk/objects/UML/message.c	Sat Jan 17 14:00:59 2009
@@ -149,10 +149,11 @@
   /* can't use PROP_STD_TEXT_COLOUR_OPTIONAL cause it has PROP_FLAG_DONT_SAVE. It is designed to fill the Text object - not some subset */
   PROP_STD_TEXT_COLOUR_OPTIONS(PROP_FLAG_VISIBLE|PROP_FLAG_STANDARD|PROP_FLAG_OPTIONAL),
   PROP_STD_LINE_COLOUR_OPTIONAL, 
-  /* backward compatibility */
-  { "text", PROP_TYPE_STRING, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Message:"), NULL, NULL },
+  /* how it used to be before 0.96+SVN */
+  { "text", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Message:"), NULL, NULL },
   /* new name matching "same name, same type"  rule */
-  { "message", PROP_TYPE_STRING, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Message:"), NULL, NULL },
+  { "message", PROP_TYPE_STRING, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Message:"), NULL, NULL },
+
   { "type", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
     N_("Message type:"), NULL, prop_message_type_data },
   { "text_pos", PROP_TYPE_POINT, 0, 

Modified: trunk/objects/UML/node.c
==============================================================================
--- trunk/objects/UML/node.c	(original)
+++ trunk/objects/UML/node.c	Sat Jan 17 14:00:59 2009
@@ -126,10 +126,11 @@
   PROP_STD_TEXT_FONT,
   PROP_STD_TEXT_HEIGHT,
   PROP_STD_TEXT_COLOUR_OPTIONAL,
-  /* backward compatibility */
-  { "name", PROP_TYPE_TEXT, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Text"), NULL, NULL }, 
+  /* how it used to be before 0.96+SVN */
+  { "name", PROP_TYPE_TEXT, PROP_FLAG_OPTIONAL, N_("Text"), NULL, NULL }, 
   /* new name matching "same name, same type"  rule */
-  { "text", PROP_TYPE_TEXT, PROP_FLAG_OPTIONAL, N_("Text"), NULL, NULL },
+  { "text", PROP_TYPE_TEXT, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Text"), NULL, NULL },
+
   PROP_DESC_END
 };
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]