[commit] r2526 - in trunk: . SDK/Java SDK/Java/java/org/isis/gme SDK/Java/java/org/isis/gme/mga
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Sep 10 11:32:45 CDT 2014
Author: ksmyth
Date: Wed Sep 10 11:32:45 2014
New Revision: 2526
Log:
Merge branches/Java_Interface_Updates. Compile gme.jar
Modified:
trunk/ (props changed)
trunk/SDK/Java/gme.jar
trunk/SDK/Java/java/org/isis/gme/ConsoleWriter.java
trunk/SDK/Java/java/org/isis/gme/GMEOLEApp.java
trunk/SDK/Java/java/org/isis/gme/mga/MgaFolder.java
trunk/SDK/Java/java/org/isis/gme/mga/MgaProject.java
trunk/SDK/Java/java/org/isis/gme/mga/MgaRegNode.java
Modified: trunk/SDK/Java/gme.jar
==============================================================================
Binary file (source and/or target). No diff available.
Modified: trunk/SDK/Java/java/org/isis/gme/ConsoleWriter.java
==============================================================================
--- trunk/SDK/Java/java/org/isis/gme/ConsoleWriter.java Wed Sep 10 11:31:36 2014 (r2525)
+++ trunk/SDK/Java/java/org/isis/gme/ConsoleWriter.java Wed Sep 10 11:32:45 2014 (r2526)
@@ -36,6 +36,7 @@
import org.isis.gme.bon.JBuilder;
import org.isis.gme.mga.MgaClient;
import org.isis.gme.mga.MgaClients;
+import org.isis.gme.mga.MgaProject;
import org.isis.jaut.Apartment;
import org.isis.jaut.Dispatch;
@@ -46,18 +47,24 @@
private static AreaPrinter errorPrinter = null;
private static AreaPrinter stdPrinter = null;
- private ConsoleWriter(JBuilder builder){
- Object clients =builder.getProject().get("Clients");
+ private ConsoleWriter(JBuilder builder)
+ {
+ this(builder.getProject());
+ }
+
+ private ConsoleWriter(MgaProject project)
+ {
+ Object clients = project.get("Clients");
MgaClients mgaClients = new MgaClients((Dispatch)clients);
- for(MgaClient c: mgaClients.getAll()){
- if(c.getName().equals("GME.Application")){
- gmeApp = new GMEOLEApp(c.getOLEServer());
- stdPrinter = new AreaPrinter(GMEOLEApp.MSG_NORMAL);
- errorPrinter = new AreaPrinter(GMEOLEApp.MSG_ERROR);
- return;
- }
- }
- JOptionPane.showMessageDialog(null,"Unable to redirect streams");
+ for(MgaClient c: mgaClients.getAll()){
+ if(c.getName().equals("GME.Application")){
+ gmeApp = new GMEOLEApp(c.getOLEServer());
+ stdPrinter = new AreaPrinter(GMEOLEApp.MSG_NORMAL);
+ errorPrinter = new AreaPrinter(GMEOLEApp.MSG_ERROR);
+ return;
+ }
+ }
+ JOptionPane.showMessageDialog(null,"Unable to redirect streams");
}
public static void redirectStreamsToConsole(JBuilder builder){
@@ -66,6 +73,12 @@
System.setErr(new PrintStream(errorPrinter));
}
+ public static void redirectStreamsToConsole(MgaProject project){
+ _instance = new ConsoleWriter(project);
+ System.setOut(new PrintStream(stdPrinter));
+ System.setErr(new PrintStream(errorPrinter));
+ }
+
public static ConsoleWriter getInstance(){
return _instance;
}
@@ -98,25 +111,11 @@
@Override
public void write(int b) throws IOException {
-
-
- synchronized(line){
- if((char)b == '<'){
- line += "<";
- }else if((char)b == '>'){
- line += ">";
- }else{
- line += ""+(char)b;
- }
-
- }
- if(line.endsWith("\n")){
- //gmeApp.consoleMessage(line, type);
-
- //line = "";
+
+ // "<" or ">" requires explicit "<" or ">"
+ synchronized(line) {
+ line += "" + (char)b;
}
-
-
}
public void flushContent(){
Modified: trunk/SDK/Java/java/org/isis/gme/GMEOLEApp.java
==============================================================================
--- trunk/SDK/Java/java/org/isis/gme/GMEOLEApp.java Wed Sep 10 11:31:36 2014 (r2525)
+++ trunk/SDK/Java/java/org/isis/gme/GMEOLEApp.java Wed Sep 10 11:32:45 2014 (r2526)
@@ -42,9 +42,15 @@
}
- public GMEOLEApp(JBuilder builder){
+ public GMEOLEApp(JBuilder builder)
+ {
+ this(builder.getProject());
+ }
+
+ public GMEOLEApp(MgaProject project)
+ {
MgaClient client = null;
- Object clients =builder.getProject().get("Clients");
+ Object clients = project.get("Clients");
MgaClients mgaClients = new MgaClients((Dispatch)clients);
for(MgaClient c: mgaClients.getAll()){
if(c.getName().equals("GME.Application")){
@@ -54,9 +60,6 @@
}
attach( client.getOLEServer() );
changeInterface( "{81191A44-B898-4143-BF8B-CA7501FEC19A}" );
-
-
-
}
public GMEOLEApp( Dispatch d )
Modified: trunk/SDK/Java/java/org/isis/gme/mga/MgaFolder.java
==============================================================================
--- trunk/SDK/Java/java/org/isis/gme/mga/MgaFolder.java Wed Sep 10 11:31:36 2014 (r2525)
+++ trunk/SDK/Java/java/org/isis/gme/mga/MgaFolder.java Wed Sep 10 11:32:45 2014 (r2526)
@@ -259,9 +259,14 @@
if( lastParam != null && lastParam.length > 0 )
lastParam[0] = vnt_lastParam.toVT_PTR();
- }
-
- public MgaRegNode getRegistryNode(String lastParam)
+ }*/
+
+ public MgaRegNode getRegistryNode(String path)
+ {
+ return new MgaRegNode((Dispatch) get( "RegistryNode", path));
+ }
+
+ /*public MgaRegNode getRegistryNode(String lastParam)
{
return new MgaRegNode(call( "RegistryNode", lastParam).toDispatch());
}
@@ -282,9 +287,19 @@
return result_of_Registry;
- }
-
- public String getRegistryValue(String lastParam)
+ }*/
+
+ public String getRegistryValue(String path)
+ {
+ return get( "RegistryValue", path).toString();
+ }
+
+ public void setRegistryValue(String path, String value)
+ {
+ put("RegistryValue", path, value);
+ }
+
+ /*public String getRegistryValue(String lastParam)
{
return call( "RegistryValue", lastParam).toString();
}
@@ -369,9 +384,14 @@
/*public MgaFCO getChildFCO(String lastParam)
{
return new MgaFCO(call( "ChildFCO", lastParam).toDispatch());
- }
+ }*/
- public void getDescendantFCOs(MgaFilter filter, VT_PTR lastParam)
+ public MgaFCOs getDescendantFCOs(MgaFilter filter)
+ {
+ return new MgaFCOs( (Dispatch)call("GetDescendantFCOs", filter) );
+ }
+
+ /*public void getDescendantFCOs(MgaFilter filter, VT_PTR lastParam)
{
Dispatch.CallSub(this, "GetDescendantFCOs", filter, lastParam);
}
Modified: trunk/SDK/Java/java/org/isis/gme/mga/MgaProject.java
==============================================================================
--- trunk/SDK/Java/java/org/isis/gme/mga/MgaProject.java Wed Sep 10 11:31:36 2014 (r2525)
+++ trunk/SDK/Java/java/org/isis/gme/mga/MgaProject.java Wed Sep 10 11:32:45 2014 (r2526)
@@ -293,6 +293,11 @@
return new MgaFolder( (Dispatch)get("RootFolder") );
}
+ public MgaFilter createFilter()
+ {
+ return new MgaFilter( (Dispatch)call( "CreateFilter") );
+ }
+
/* public void createFilter(VT_PTR lastParam)
{
call( "CreateFilter", lastParam);
Modified: trunk/SDK/Java/java/org/isis/gme/mga/MgaRegNode.java
==============================================================================
--- trunk/SDK/Java/java/org/isis/gme/mga/MgaRegNode.java Wed Sep 10 11:31:36 2014 (r2525)
+++ trunk/SDK/Java/java/org/isis/gme/mga/MgaRegNode.java Wed Sep 10 11:32:45 2014 (r2526)
@@ -147,4 +147,9 @@
{
Dispatch.CallSub(this, "RemoveTree");
}*/
+
+ public void removeTree()
+ {
+ call("RemoveTree");
+ }
}
More information about the gme-commit
mailing list