ff-attic/imxmi
2
0
Fork 0
Code Activity

removed some magic from jpa.

Browse source
This commit is contained in:
Willem Cazander 2014-08-25 22:27:59 +02:00
parent 30418cad13
commit e643a69308
18 changed files with 157 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/core/VascTechDemoStartup.java
View file

@ -232,9 +232,11 @@ public enum VascTechDemoStartup {
serverConfigService.stop();
tomcatService.stop();
databaseService.stop();
swingGuiService.stop();
long stopTime = System.currentTimeMillis();
logger.info("VascTechDemo shutdown in "+(stopTime-startTime)+" ms.");
swingGuiService.stop();// fixme kills logging
} catch (Exception e) {
e.printStackTrace();
System.exit(1);

13
vasc-demo/vasc-demo-server/src/main/java/net/forwardfire/vasc/demo/server/ui/ServerGuiApplication.java
View file

@ -115,13 +115,13 @@ public class ServerGuiApplication extends SingleFrameApplication {
updateInfoTask.run=false; // app will exit so stop update
return true;
} else {
logger.finer("Closing application window.");
logger.info("Closing application window.");
updateInfoTask.doUpdate=false; // close window
ServerGuiApplication.getInstance().getMainFrame().setVisible(false);
return false;
}
}
@Override
public void willExit(EventObject event) {
}
@ -150,7 +150,7 @@ public class ServerGuiApplication extends SingleFrameApplication {
static public ServerGuiApplication getInstance() {
return getInstance(ServerGuiApplication.class);
}
private void startSystemTray() {
if (!SystemTray.isSupported()) {
return;
@ -158,7 +158,7 @@ public class ServerGuiApplication extends SingleFrameApplication {
final PopupMenu popup = new PopupMenu();
final TrayIcon trayIcon = new TrayIcon(createImageIcon("/net/forwardfire/vasc/demo/server/ui/resources/tray-icon.png", "tray icon").getImage());
final SystemTray tray = SystemTray.getSystemTray();
MenuItem aboutItem = new MenuItem("About");
aboutItem.addActionListener(new ActionListener() {
@Override
@ -185,7 +185,6 @@ public class ServerGuiApplication extends SingleFrameApplication {
}
});
popup.add(exitItem);
popup.addSeparator();
popup.add(aboutItem);
@ -196,7 +195,7 @@ public class ServerGuiApplication extends SingleFrameApplication {
try {
tray.add(trayIcon);
} catch (AWTException e) {
System.out.println("TrayIcon could not be added.");
logger.warning("TrayIcon could not be added.");
}
}
@ -212,7 +211,7 @@ public class ServerGuiApplication extends SingleFrameApplication {
UIManager.put("TabbedPane.font", Font.decode("SansSerif-BOLD-12"));
UIManager.put("TitledBorder.font", Font.decode("SansSerif-BOLD-16"));
UIManager.put("FireDial.font", Font.decode("SansSerif-9"));
String colorName = "laf-colors";
ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl==null) {