[GME-commit] GMESRC/Java/java/org/isis/gme/mga TestMgaLayer1.java, 1.2, 1.3 MgaModel.java, 1.2, 1.3 MgaFolder.java, 1.1, 1.2
Log messages of CVS commits
gme-commit at list.isis.vanderbilt.edu
Tue Jan 8 14:39:35 CST 2008
Update of /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga
In directory escher:/tmp/cvs-serv26241/org/isis/gme/mga
Modified Files:
TestMgaLayer1.java MgaModel.java MgaFolder.java
Log Message:
createFolder, createChildObjects parameter number error fixed
testmgalayer example cleand up
CVS User: Gyorgy Balogh, ISIS (bogyom)
Index: MgaModel.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga/MgaModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaModel.java 14 Mar 2006 15:01:23 -0000 1.2
--- MgaModel.java 8 Jan 2008 20:39:32 -0000 1.3
***************
*** 515,531 ****
public MgaFCO createChildObject( MgaMetaRole meta )
{
! Variant returned_fco_variant = new Variant();
! returned_fco_variant.allocate(Variant.VT_DISPATCH);
!
! Variant arguments[] = new Variant[2];
arguments[0] = new Variant(meta);
- arguments[1] = new Variant(returned_fco_variant);
Variant retval = new Variant();
! retval.allocate(Variant.VT_EMPTY);
invoke( getIDOfName("CreateChildObject"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( returned_fco_variant.getDispatch() );
}
--- 515,527 ----
public MgaFCO createChildObject( MgaMetaRole meta )
{
! Variant arguments[] = new Variant[1];
arguments[0] = new Variant(meta);
Variant retval = new Variant();
! retval.allocate(Variant.VT_DISPATCH);
invoke( getIDOfName("CreateChildObject"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( retval.getDispatch() );
}
***************
*** 564,571 ****
public MgaFCO createSimpleConn( MgaMetaRole meta, MgaFCO src, MgaFCO dst, MgaFCOs srcrefs, MgaFCOs dstrefs )
{
! Variant returned_fco_variant = new Variant();
! returned_fco_variant.allocate(Variant.VT_DISPATCH);
!
! Variant arguments[] = new Variant[6];
arguments[0] = new Variant(meta);
arguments[1] = new Variant(src);
--- 560,564 ----
public MgaFCO createSimpleConn( MgaMetaRole meta, MgaFCO src, MgaFCO dst, MgaFCOs srcrefs, MgaFCOs dstrefs )
{
! Variant arguments[] = new Variant[5];
arguments[0] = new Variant(meta);
arguments[1] = new Variant(src);
***************
*** 573,602 ****
arguments[3] = new Variant(srcrefs);
arguments[4] = new Variant(dstrefs);
- arguments[5] = new Variant(returned_fco_variant);
Variant retval = new Variant();
! retval.allocate(Variant.VT_EMPTY);
invoke( getIDOfName("CreateSimpleConn"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( returned_fco_variant.getDispatch() );
}
public MgaFCO createReference( MgaMetaRole meta, MgaFCO target )
{
! Variant returned_fco_variant = new Variant();
! returned_fco_variant.allocate(Variant.VT_DISPATCH);
!
! Variant arguments[] = new Variant[3];
arguments[0] = new Variant(meta);
arguments[1] = new Variant(target);
- arguments[2] = new Variant(returned_fco_variant);
Variant retval = new Variant();
! retval.allocate(Variant.VT_EMPTY);
invoke( getIDOfName("CreateReference"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( returned_fco_variant.getDispatch() );
}
--- 566,590 ----
arguments[3] = new Variant(srcrefs);
arguments[4] = new Variant(dstrefs);
Variant retval = new Variant();
! retval.allocate(Variant.VT_DISPATCH);
invoke( getIDOfName("CreateSimpleConn"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( retval.getDispatch() );
}
public MgaFCO createReference( MgaMetaRole meta, MgaFCO target )
{
! Variant arguments[] = new Variant[2];
arguments[0] = new Variant(meta);
arguments[1] = new Variant(target);
Variant retval = new Variant();
! retval.allocate(Variant.VT_DISPATCH);
invoke( getIDOfName("CreateReference"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( retval.getDispatch() );
}
Index: MgaFolder.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga/MgaFolder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaFolder.java 6 Feb 2004 16:27:21 -0000 1.1
--- MgaFolder.java 8 Jan 2008 20:39:32 -0000 1.2
***************
*** 212,246 ****
public MgaFolder createFolder( MgaMetaFolder meta )
! {
! Variant returned_folder_variant = new Variant();
! returned_folder_variant.allocate(Variant.VT_DISPATCH);
!
! Variant arguments[] = new Variant[2];
arguments[0] = new Variant(meta);
- arguments[1] = new Variant(returned_folder_variant);
Variant retval = new Variant();
! retval.allocate(Variant.VT_EMPTY);
invoke( getIDOfName("CreateFolder"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFolder( returned_folder_variant.getDispatch() );
}
public MgaFCO createRootObject( MgaMetaFCO meta )
{
! Variant returned_fco_variant = new Variant();
! returned_fco_variant.allocate(Variant.VT_DISPATCH);
!
! Variant arguments[] = new Variant[2];
arguments[0] = new Variant(meta);
- arguments[1] = new Variant(returned_fco_variant);
Variant retval = new Variant();
! retval.allocate(Variant.VT_EMPTY);
invoke( getIDOfName("CreateRootObject"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( returned_fco_variant.getDispatch() );
}
--- 212,238 ----
public MgaFolder createFolder( MgaMetaFolder meta )
! {
! Variant arguments[] = new Variant[1];
arguments[0] = new Variant(meta);
Variant retval = new Variant();
! retval.allocate(Variant.VT_DISPATCH);
invoke( getIDOfName("CreateFolder"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFolder( retval.getDispatch() );
}
public MgaFCO createRootObject( MgaMetaFCO meta )
{
! Variant arguments[] = new Variant[1];
arguments[0] = new Variant(meta);
Variant retval = new Variant();
! retval.allocate(Variant.VT_DISPATCH);
invoke( getIDOfName("CreateRootObject"), DISPATCH_METHOD, arguments, null, retval );
! return new MgaFCO( retval.getDispatch() );
}
Index: TestMgaLayer1.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/mga/TestMgaLayer1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMgaLayer1.java 12 Feb 2004 16:40:44 -0000 1.2
--- TestMgaLayer1.java 8 Jan 2008 20:39:32 -0000 1.3
***************
*** 31,125 ****
package org.isis.gme.mga;
! import org.isis.gme.meta.MgaMetaAspect;
! import org.isis.gme.meta.MgaMetaAspects;
! import org.isis.gme.meta.MgaMetaAttribute;
! import org.isis.gme.meta.MgaMetaFCO;
! import org.isis.gme.meta.MgaMetaModel;
! import org.isis.gme.meta.MgaMetaPart;
! import org.isis.gme.mgautil.MgaRegistrar;
import org.isis.jaut.Apartment;
- import org.isis.jaut.Dispatch;
- /**
- *
- * @author bogyom
- */
public class TestMgaLayer1
! {
! private void printAspectNames( MgaModel model )
! {
! System.out.println( "aspect of " + model.getName() );
! MgaMetaModel metaModel = model.getMetaModel();
! MgaMetaAspects aspects = metaModel.getAspects();
! for( int i=0; i<aspects.getCount(); ++i )
! System.out.println( " " + aspects.getItem(i).getName() );
! }
!
! private void showPorts( MgaModel model, MgaMetaAspect aspect )
! {
! MgaPart parts[] = model.getAspectParts(aspect).getAll();
! for( int i=0; i<parts.length; ++i )
! {
! MgaFCO fco = parts[i].getFCO();
! MgaMetaPart metaPart = new MgaMetaPart( parts[i].getMeta() );
! if( metaPart.getIsLinked() )
! {
! System.out.println( " " + fco.getName() );
! }
! }
! }
!
! private void showModel( MgaModel model, MgaMetaAspect aspect )
! {
! System.out.println( "\nmodel: " + model.getName() + " aspect: " + aspect.getName() );
!
! MgaPart parts[] = model.getAspectParts(aspect).getAll();
! for( int i=0; i<parts.length; ++i )
! {
! MgaFCO fco = parts[i].getFCO();
! MgaMetaFCO metaFco = fco.getMeta();
! int type = fco.getObjType();
! MgaPart.GmeAttrs attr = parts[i].getGmeAttrs();
! MgaMetaPart metaPart = new MgaMetaPart( parts[i].getMeta() );
!
! String iconPath = metaFco.getRegistryValue("icon");
!
!
! if( type == MgaObject.OBJTYPE_ATOM )
! {
! System.out.println( "atom: " + fco.getName() + "," + attr.x + "," + attr.y + "," + iconPath );
! }
! else if( type == MgaObject.OBJTYPE_MODEL )
! {
! System.out.println( "model: " + fco.getName() + "," + attr.x + "," + attr.y + "," + iconPath );
!
! // find out aspect for childs
! MgaMetaModel metaModel = new MgaMetaModel( (new MgaModel( fco )).getMetaModel() );
! String kindAspect = metaPart.getKindAspect();
! if( kindAspect.length() == 0 )
! kindAspect = aspect.getName();
! MgaMetaAspect aspectForChildren = metaModel.getAspectByName( kindAspect );
!
! // show ports
! showPorts( new MgaModel(fco), aspectForChildren );
! }
! else if( type == MgaObject.OBJTYPE_REFERENCE )
! {
! //getReferred()
! }
! else if( type == MgaObject.OBJTYPE_CONNECTION )
! {
! MgaSimpleConnection conn = new MgaSimpleConnection( fco );
! System.out.println( "connection from " + conn.getSrc().getName() + " to " + conn.getDst().getName() );
! }
! }
! }
!
! private void printName( MgaObject obj , String prefix )
{
System.out.println( prefix + obj.getName() );
int type = obj.getObjType();
! if( type == 1 || type == 6 )
{
MgaObjects children = obj.getChildObjects();
--- 31,50 ----
package org.isis.gme.mga;
! import org.isis.gme.meta.MgaMetaFolder;
import org.isis.jaut.Apartment;
public class TestMgaLayer1
! {
! /**
! * Print out item names recursively
! * @param obj
! * @param prefix
! */
! static void printName( MgaObject obj , String prefix )
{
System.out.println( prefix + obj.getName() );
int type = obj.getObjType();
! if( type == MgaObject.OBJTYPE_FOLDER || type == MgaObject.OBJTYPE_MODEL )
{
MgaObjects children = obj.getChildObjects();
***************
*** 129,164 ****
}
! private String getIconFileName( MgaFCO fco )
! {
! MgaMetaFCO metaFco = fco.getMeta();
!
! String iconFile = metaFco.getRegistryValue("icon");
!
! MgaRegistrar reg = new MgaRegistrar();
! String iconPath = reg.getIconPath(MgaRegistrar.REGACCESS_BOTH);
!
! //getProjectConnStr()
! //getParadigmConnStr()
!
! MgaProject proj = fco.getProject();
!
!
! return "";
! }
!
! private void printAttributes( MgaFCO fco )
! {
! System.out.println( "Attributes of " + fco.getName() +":" );
!
! MgaAttribute [] attribs = fco.getAttributes().getAll();
! for( int i=0; i<attribs.length; ++i )
! {
! MgaMetaAttribute metaAttr = attribs[i].getMeta();
!
! System.out.println( " " + metaAttr.getName() + " = " + attribs[i].getValue() );
! }
! }
!
! private void test1()
{
Apartment.enter(true);
--- 54,58 ----
}
! static void printOutStructureTest()
{
Apartment.enter(true);
***************
*** 166,269 ****
// create and open mga project
MgaProject project = MgaProject.createInstance();
! project.open( "MGA=C:\\Temp\\gmetest\\alma3.mga" );
! //project.open( "MGA=C:\\Temp\\gmetest\\SFDemo.mga" );
! //project.open( "MGA=C:\\Temp\\gmetest\\MetaGME-model.mga" );
project.beginTransaction( null );
-
- // write object structure
- MgaObject root = new MgaObject( project.getRootFolder() );
- //printName( root, "" );
-
- // show model
-
- //MgaModel model = new MgaModel( root.getChildObjects().getItem(0).getChildObjects().getItem(14) );
- //MgaModel model = new MgaModel( root.getChildObjects().getItem(0));
- //MgaMetaModel metaModel = model.getMetaModel();
- //MgaMetaAspect aspect = metaModel.getAspects().getItem(0);
- //printAspectNames( model );
- //showModel( model, aspect );
- //printAttributes( model );
-
- //System.out.println( project.getName() );
-
- //MgaFCO fco = new MgaModel( root.getChildObjects().getItem(0) );
- //MgaMetaFCO metaFCO = fco.getMeta();
-
- //MgaFolder folder = new MgaFolder( root );//.getChildObjects().getItem(0));
- //MgaFCO fco1 = folder.createRootObject( metaFCO );
- //fco1.setName("ez az uj jatekos");
-
- printName( root, "" );
-
-
-
- //System.out.println( fco1.getName() );
-
-
-
- //project.commitTransaction();
- project.abortTransaction();
- //project.save();
- project.close();
- Apartment.leave();
- System.out.println("done");
- }
! void test3()
! {
! MgaProject project = MgaProject.createInstance();
!
! // project.open( "MGA=C:\\Temp\\gmetest\\alma3.mga" );
!
! // project.beginTransaction( null );
! // System.out.println(project.getName());
! // project.commitTransaction();
!
! project.close();
! }
!
! void test2()
! {
! try
! {
! Apartment.enter(false);
! test3();
! Apartment.leave();
!
! System.out.println("done");
! }
! catch(Exception e)
! {
! e.printStackTrace();
! }
}
-
- private void xmlBackEndTest1()
- {
- Apartment.enter(true);
-
- MgaProject project = MgaProject.createInstance();
- project.open( "MGA=C:\\Temp\\gmetest\\alma2.mga" );
! //project.beginTransaction( null );
! project.save( "MGA=C:\\Temp\\gmetest\\alma123.mga", false );
! project.save( "XML=C:\\Temp\\gmetest\\alma124.mga", false );
!
! //project.commitTransaction();
!
! project.close();
! Apartment.leave();
! System.out.println("done");
! }
!
! public static void bonTest( int project, int currentObj, int selectedObjs, int param )
{
try
{
Apartment.enter(false);
!
! MgaProject p = new MgaProject( new Dispatch(project) );
! System.out.println( "A project neve:" + p.getName() );
Apartment.leave();
--- 60,97 ----
// create and open mga project
MgaProject project = MgaProject.createInstance();
! project.open( "MGA=C:\\Temp\\1.mga" );
!
project.beginTransaction( null );
! // print out structure
! printName( new MgaObject( project.getRootFolder() ), "" );
!
! project.commitTransaction();
}
! /**
! * Creates a project with two folders
! */
! static void createProjectTest()
{
try
{
Apartment.enter(false);
!
! MgaProject project = MgaProject.createInstance();
! project.create( "MGA=C:\\Temp\\test.mga", "SF" );
! project.beginTransaction(null);
! MgaFolder dest_root = project.getRootFolder();
!
! MgaMetaFolder meta_folder = project.getRootMeta().getRootFolder().getDefinedFolders().getItem(0);
!
! MgaFolder folder = dest_root.createFolder(meta_folder);
! folder.setName("created_folder1");
! folder = dest_root.createFolder(meta_folder);
! folder.setName("created_folder2");
!
! project.commitTransaction();
! project.save();
Apartment.leave();
***************
*** 274,283 ****
}
}
public static void main(String[] args)
{
! TestMgaLayer1 t = new TestMgaLayer1();
! t.test2();
! //t.xmlBackEndTest1();
}
--- 102,111 ----
}
}
+
public static void main(String[] args)
{
! //printOutStructureTest();
! createProjectTest();
}
More information about the GME-commit
mailing list