ff-attic/imxmi
2
Fork 0
Code Activity

Removed eclipse settings.

Browse source
This commit is contained in:
Willem Cazander 2012-05-07 16:28:50 +02:00
parent c23d14522f
commit 2872143028
130 changed files with 175 additions and 982 deletions
Download patch file Download diff file Expand all files Collapse all files

38
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/TechUI.java
View file

@ -35,16 +35,15 @@ import java.util.logging.LogManager;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.apache.juli.logging.LogFactory;
import org.jdesktop.application.Application;
import org.jdesktop.application.FrameView;
import org.jdesktop.application.SingleFrameApplication;
import net.forwardfire.vasc.core.VascController;
import net.forwardfire.vasc.demo.tech.ui.components.JMainPanel;
import net.forwardfire.vasc.demo.tech.ui.components.JMainPanelMenuBar;
import net.forwardfire.vasc.demo.tech.web.core.TomcatManager;
public class TechUI extends SingleFrameApplication {
@ -105,6 +104,7 @@ public class TechUI extends SingleFrameApplication {
} catch (Exception e) {
e.printStackTrace();
}
vascManager.stop();
long stopTime = System.currentTimeMillis();
logger.info("TechUI stopped in "+(stopTime-startTime)+" ms.");
}
@ -134,6 +134,21 @@ public class TechUI extends SingleFrameApplication {
vascManager.start();
autoLoadVasc();
tomcatManager = new TomcatManager();
tomcatManager.setVascController(vascManager.getVascController());
Thread t = new Thread(new Runnable() {
public void run() {
try {
Thread.sleep(2000); // let gui come up.
tomcatManager.start();
} catch (Exception e) {
e.printStackTrace();
}
}
});
t.start();
long stopTime = System.currentTimeMillis();
logger.info("TechUI initialized in "+(stopTime-startTime)+" ms.");
}
@ -149,21 +164,6 @@ public class TechUI extends SingleFrameApplication {
mainView.getFrame().setMinimumSize(new Dimension(1024-64,768-128));
show(mainView);
tomcatManager = new TomcatManager();
tomcatManager.setVascController(vascManager.getVascController());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
try {
tomcatManager.start();
} catch (Exception e) {
e.printStackTrace();
}
}
});
long stopTime = System.currentTimeMillis();
logger.info("TechUI startup in "+(stopTime-startTime)+" ms total startup in "+(stopTime-startTime)+" ms.");
} catch (Exception e) {
@ -184,4 +184,8 @@ public class TechUI extends SingleFrameApplication {
public VascManager getVascManager() {
return vascManager;
}
public VascController getVascController() {
return vascManager.getVascController();
}
}

4
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/VascManager.java
View file

@ -38,6 +38,7 @@ public class VascManager {
}
public void start() {
logger.finer("Starting vascmanager");
try {
vascController = DefaultVascFactory.getDefaultVascController(2288L,"forwardfire.net","user","admin");
initEditor();
@ -65,11 +66,12 @@ public class VascManager {
public void openFile(File file) {
logger.info("Vasc open file: "+file.getAbsoluteFile());
try {
VascParser parser = new VascParser(vascController);
File f = File.createTempFile("test-vasc", ".xml");
parser.setDebugOutputStream(new FileOutputStream(f));
parser.parseFile(file.getAbsolutePath());
parser.parseFile(file);
DefaultVascFactory.fillVascControllerLocalEntries((VascEntryControllerLocal) vascController.getVascEntryController(), vascController);
} catch (Exception e) {

2
vasc-demo/vasc-demo-tech/vasc-demo-tech-ui/src/main/java/net/forwardfire/vasc/demo/tech/ui/components/JMainPanel.java
View file

@ -193,7 +193,7 @@ public class JMainPanel extends JPanel {
DefaultMutableTreeNode root = (DefaultMutableTreeNode)vascTree.getModel().getRoot();
root.removeAllChildren();
DefaultMutableTreeNode fieldTypes = new DefaultMutableTreeNode("FieldTypes");
DefaultMutableTreeNode fieldTypes = new DefaultMutableTreeNode("VascFieldTypes");
for (String id:vascManager.getVascController().getVascEntryFieldTypeController().getVascEntryFieldTypeIds()) {
DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(new VascTreeNode(VascTreeNodeType.FIELD_TYPE,id));
fieldTypes.add(typeNode);