[GME-commit] GMESRC/Java/java/org/isis/gme/mga MgaEventSink.java, 1.1, 1.2 MgaProject.java, 1.1, 1.2 MgaTerritory.java, 1.1, 1.2

[Log messages of CVS commits]

Update of /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga
In directory escher:/tmp/cvs-serv7992/Java/java/org/isis/gme/mga

Modified Files:
	MgaEventSink.java MgaProject.java MgaTerritory.java 
Log Message:
1. PartBrowser ActiveX control
2. Drag-drop support PartBrowserbol kozvetlenul a treeview-ba (AggregateTreeCtrl.cpp)
3. Java-s kodok az Eclipse-es kiserletezesi prototipushoz


CVS User:  (csaba)

Index: MgaProject.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga/MgaProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaProject.java	6 Feb 2004 16:27:21 -0000	1.1
--- MgaProject.java	13 Feb 2008 21:23:58 -0000	1.2
***************
*** 140,162 ****
          return ((Integer)get( "OperationsMask" )).intValue();
      }
!     
!     public MgaTerritory createTerritory( MgaEventSink handler, MgaEventSink rwhandler )
      {
!         MgaTerritory t    = new MgaTerritory();
!         Variant      tref = new Variant( t );
!         //VT_UNKNOWN
!         
!         Variant[] args = new Variant[3];
!         args[0] = new Variant( Variant.VT_DISPATCH );
!         //args[0].setInt( handler.getSinkPointer() );
!         args[1] = new Variant( tref );
!         args[2] = new Variant( Variant.VT_DISPATCH );
!         //args[2].setInt( rwhandler.getSinkPointer() );
!         
!         //invoke( getIDOfName("CreateTerritory"), DISPATCH_METHOD, args, null, null );
          
!         call( "CreateTerritory", args[0], t, args[2] );
          
!         return t;
      }
      
--- 140,174 ----
          return ((Integer)get( "OperationsMask" )).intValue();
      }
!   
!     public MgaTerritory createTerritory( Dispatch handler, Dispatch rwhandler )
      {
!        	Variant returned_territory_variant = new Variant();
          
!     	Variant arguments[] = new Variant[3];
!         arguments[0]        = Variant.create(Variant.VT_NULL);
!         arguments[1]        = new Variant(returned_territory_variant);
!         arguments[2]        = Variant.create(Variant.VT_NULL);
!          
!         Variant retval = new Variant();
!         retval.allocate(Variant.VT_EMPTY);
! 
!         invoke( getIDOfName("CreateTerritory"), DISPATCH_METHOD, arguments, null, retval );
! 
!         return new MgaTerritory( returned_territory_variant.getDispatch() );
!     }
!     
!     public MgaTerritory createTerritoryWithoutSink()
!     {
!     	Variant returned_territory_variant = new Variant();
!     	returned_territory_variant.allocate(Variant.VT_DISPATCH);
!     	Variant arguments[] = new Variant[1]; 
!     	arguments[0]        = new Variant(returned_territory_variant);
          
!     	Variant retval = new Variant();
!         retval.allocate(Variant.VT_EMPTY);
! 
!         invoke( getIDOfName("CreateTerritoryWithoutSink"), DISPATCH_METHOD, arguments, null, retval );
! 
!         return new MgaTerritory( returned_territory_variant.getDispatch() );
      }
      
***************
*** 195,206 ****
      
      public MgaTerritory getActvieTerritory()
!     {
!         // todo: test!
!         
!         Variant disp     = Variant.create( Variant.VT_DISPATCH );
!         
!         invoke( getIDOfName("ActiveTerritory"), DISPATCH_PROPERTYGET, null, null, new Variant(disp) );
!         
!         return new MgaTerritory( disp.getDispatch() );
      }
      
--- 207,216 ----
      
      public MgaTerritory getActvieTerritory()
!     {   
!     	Dispatch d = (Dispatch)get("ActiveTerritory");
!     	if( d.isNull() )
!     		return null;
!     	else
!     		return new MgaTerritory(d);
      }
      

Index: MgaTerritory.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga/MgaTerritory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaTerritory.java	6 Feb 2004 16:27:21 -0000	1.1
--- MgaTerritory.java	13 Feb 2008 21:23:58 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  
  import org.isis.jaut.Dispatch;
+ import org.isis.jaut.Variant;
  
  /**
***************
*** 52,57 ****
  	[ propput, helpstring("property RWEventMask (defaults to NONE)")] HRESULT RWEventMask([in] unsigned long eventmask);
  	[ helpstring("Associate object with user data")] HRESULT Associate([in] IMgaObject *obj, [in] VARIANT userdata);
- 	[ helpstring("property OpenObj")] HRESULT OpenObj([in] IMgaObject *obj, [in, out] IMgaObject **newobj);
- 	[ helpstring("property OpenFCO")] HRESULT OpenFCO([in] IMgaFCO *obj, [in, out] IMgaFCO **newobj);
  	[ helpstring("property OpenFCOs")] HRESULT OpenFCOs([in] IMgaFCOs *obj, [in, out] IMgaFCOs **newobj);
  	[ helpstring("property CloseObj")] HRESULT CloseObj([in] IMgaObject *obj);
--- 53,56 ----
***************
*** 64,67 ****
--- 63,101 ----
  		call( "Flush" );
  	}
+ 	
+ 	public MgaFCO openFCO( MgaFCO fco )
+     {
+ 		Variant returned_fco_variant = new Variant();
+ 		returned_fco_variant.allocate(Variant.VT_DISPATCH);
+ 	   
+ 		Variant arguments[] = new Variant[2];
+ 		arguments[0]        = new Variant(fco);
+ 		arguments[1]        = new Variant(returned_fco_variant);
+ 		
+         Variant retval = new Variant();
+         retval.allocate(Variant.VT_EMPTY);
+ 
+         invoke( getIDOfName("OpenFCO"), DISPATCH_METHOD, arguments, null, retval );
+ 
+         return new MgaFCO( returned_fco_variant.getDispatch() );
+     }
+     
+     public MgaObject openObj( MgaObject obj )
+     {
+     	Variant returned_obj_variant = new Variant();
+ 		returned_obj_variant.allocate(Variant.VT_DISPATCH);
+ 	   
+ 		Variant arguments[] = new Variant[2];
+ 		arguments[0]        = new Variant(obj);
+ 		arguments[1]        = new Variant(returned_obj_variant);
+ 		
+         Variant retval = new Variant();
+         retval.allocate(Variant.VT_EMPTY);
+ 
+         invoke( getIDOfName("OpenObj"), DISPATCH_METHOD, arguments, null, retval );
+ 
+         return new MgaObject( returned_obj_variant.getDispatch() );
+   
+     }
  	
  

Index: MgaEventSink.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga/MgaEventSink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaEventSink.java	6 Feb 2004 16:27:21 -0000	1.1
--- MgaEventSink.java	13 Feb 2008 21:23:58 -0000	1.2
***************
*** 36,52 ****
   * Window>Preferences>Java>Code Generation.
   */
! public class MgaEventSink
  {
! 	private int sinkPointer = 0;
  	
! 	private native void createSink();
  		
  	public MgaEventSink()
  	{
! 		createSink();
! 		System.out.println( sinkPointer );
  	}
  	
! 	public int getSinkPointer()
  	{
  		return sinkPointer;
--- 36,51 ----
   * Window>Preferences>Java>Code Generation.
   */
! public class MgaEventSink extends Dispatch
  {
! 	//private int sinkPointer = 0;
  	
! 	//private native void createSink();
  		
  	public MgaEventSink()
  	{
! 		//createSink();
  	}
  	
! 	/*public int getSinkPointer()
  	{
  		return sinkPointer;
***************
*** 56,60 ****
  	{
  		System.out.println( "globalEvent called, event code:" + event );
! 	}
  	
  	/*public void objectEvent( MgaObject obj, int eventmask, Variant v )
--- 55,59 ----
  	{
  		System.out.println( "globalEvent called, event code:" + event );
! 	}*/
  	
  	/*public void objectEvent( MgaObject obj, int eventmask, Variant v )
***************
*** 63,69 ****
  	}			*/
  	
! 	static
  	{
  		System.loadLibrary("jaut");
! 	}
  }
--- 62,68 ----
  	}			*/
  	
! 	/*static
  	{
  		System.loadLibrary("jaut");
! 	}*/
  }