[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 bitmapDN.bmp,NONE,1.1 bitmapup.bmp,NONE,1.1 Component.rc,1.4,1.5 MetaGME2004.dsp,1.8,1.9 resource.h,1.2,1.3 TokenEx.cpp,1.1,NONE TokenEx.h,1.1,NONE

Mon Mar 8 16:23:01 CST 2004

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory braindrain:/tmp/cvs-serv21053

Modified Files:
	Component.rc MetaGME2004.dsp resource.h 
Added Files:
	bitmapDN.bmp bitmapup.bmp 
Removed Files:
	TokenEx.cpp TokenEx.h 
Log Message:
Modified:
-registry handling
-aspect mapping dlg: skip unambiguous cases, put N/A to primary field too if possible
-aspect ordering moved ahead
-kindaspect used only if necessary (in cases of references used always)

Modified Files:
 	Component.rc MetaGME2004.dsp resource.h Asp/AspectPage.cpp 
 	Asp/AspectPage.h Asp/AspectSpecDlg.cpp Asp/AspectSpecDlg.h 
 	Asp/AspectSpecTbl.cpp Asp/AspectSpecTbl.h 
 	Asp/GlobalAspOrder.cpp Asp/GlobalAspOrder.h Rep/Any.cpp 
 	Rep/Any.h Rep/AspectRep.cpp Rep/AspectRep.h Rep/Broker.cpp 
 	Rep/Dumper.cpp Rep/ModelRep.cpp Rep/ModelRep.h 
 	Rep/PointerItem.cpp Rep/ReferenceRep.cpp Rep/RoleRep.cpp 
 	Rep/Sheet.cpp 
Added Files:
 	bitmapDN.bmp bitmapup.bmp 
Removed Files:
 	TokenEx.cpp TokenEx.h Asp/AspectOrder.cpp Asp/AspectOrder.h 
	Asp/AspectOrderDlg.cpp Asp/AspectOrderDlg.h 
 	Asp/OrderDialog.cpp Asp/OrderDialog.h Asp/OrderPage.cpp 
 	Asp/OrderPage.h Asp/OrderSpecTbl.cpp Asp/OrderSpecTbl.h 


CVS User: zolmol

--- NEW FILE: bitmapDN.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bitmapup.bmp ---
(This appears to be a binary file; contents omitted.)

Index: Component.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Component.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Component.rc	2 Mar 2004 19:43:04 -0000	1.4
--- Component.rc	8 Mar 2004 22:22:58 -0000	1.5
***************
*** 119,125 ****
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 205
          TOPMARGIN, 7
!         BOTTOMMARGIN, 154
      END
  END
--- 119,125 ----
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 162
          TOPMARGIN, 7
!         BOTTOMMARGIN, 139
      END
  END
***************
*** 138,156 ****
  END
  
! IDD_ASPECTORDER_DLG DIALOG DISCARDABLE  0, 0, 212, 161
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Global Aspect Order Dialogue"
  FONT 8, "MS Sans Serif"
  BEGIN
!     DEFPUSHBUTTON   "OK",IDOK,15,135,50,14
!     PUSHBUTTON      "Cancel && Use metamodel defaults",IDCANCEL,75,135,120,
!                     14
!     LISTBOX         IDC_LIST3,15,20,103,85,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                      WS_HSCROLL | WS_TABSTOP
!     PUSHBUTTON      "Move Up",IDC_BUTTON1,135,20,60,28
!     PUSHBUTTON      "Move Down",IDC_BUTTON2,135,75,60,28
!     LTEXT           "Global aspect order",IDC_STATIC,16,10,70,8
  END
  
  
  /////////////////////////////////////////////////////////////////////////////
--- 138,165 ----
  END
  
! IDD_ASPECTORDER_DLG DIALOGEX 0, 0, 169, 146
  STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Global Aspect Order Dialogue"
  FONT 8, "MS Sans Serif"
  BEGIN
!     DEFPUSHBUTTON   "OK",IDOK,15,120,50,14
!     PUSHBUTTON      "Use metamodel defaults",IDCANCEL,75,120,82,14
!     LISTBOX         IDC_LIST3,16,20,110,85,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                      WS_HSCROLL | WS_TABSTOP
!     PUSHBUTTON      "Move Up",IDC_BUTTON1,137,36,16,13,BS_BITMAP | BS_CENTER | 
!                     BS_VCENTER,WS_EX_TRANSPARENT
!     PUSHBUTTON      "Move Down",IDC_BUTTON2,137,75,16,13,BS_BITMAP | 
!                     BS_CENTER | BS_VCENTER,WS_EX_TRANSPARENT
!     LTEXT           "Global aspect order",IDC_STATIC,16,10,94,8
  END
  
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Bitmap
+ //
+ 
+ IDB_BITMAPUP            BITMAP  DISCARDABLE     "bitmapUP.bmp"
+ IDB_BITMAPDN            BITMAP  DISCARDABLE     "bitmapDN.bmp"
  
  /////////////////////////////////////////////////////////////////////////////

Index: MetaGME2004.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MetaGME2004.dsp	2 Mar 2004 19:43:04 -0000	1.8
--- MetaGME2004.dsp	8 Mar 2004 22:22:58 -0000	1.9
***************
*** 583,586 ****
--- 583,594 ----
  # Begin Source File
  
+ SOURCE=.\bitmapDN.bmp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\bitmapUP.bmp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\CompIcon.ico
  # End Source File

Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/resource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** resource.h	2 Mar 2004 19:43:04 -0000	1.2
--- resource.h	8 Mar 2004 22:22:58 -0000	1.3
***************
*** 6,9 ****
--- 6,10 ----
  #define IDD_ASPECT_ORDER_PAGE           106
  #define IDD_ASPECT_PAGE                 107
+ #define IDI_ICON1                       199
  #define IDC_TAB1                        201
  #define IDD_ASPECTORDER_DLG             202
***************
*** 11,14 ****
--- 12,17 ----
  #define IDC_BUTTON2                     205
  #define IDC_LIST3                       206
+ #define IDB_BITMAPUP                    219
+ #define IDB_BITMAPDN                    220
  
  // Next default values for new objects
***************
*** 16,22 ****
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        204
  #define _APS_NEXT_COMMAND_VALUE         32768
! #define _APS_NEXT_CONTROL_VALUE         210
  #define _APS_NEXT_SYMED_VALUE           101
  #endif
--- 19,25 ----
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE        221
  #define _APS_NEXT_COMMAND_VALUE         32768
! #define _APS_NEXT_CONTROL_VALUE         211
  #define _APS_NEXT_SYMED_VALUE           101
  #endif

--- TokenEx.cpp DELETED ---

--- TokenEx.h DELETED ---