ff-attic/imxmi
2
0
Fork 0
Code Activity

Switch to new meta model,fixed small bugs and made demo work pretty oke.

Browse source
This commit is contained in:
Willem Cazander 2013-01-11 23:48:36 +01:00
parent afd821c360
commit b3635cf64d
46 changed files with 1055 additions and 688 deletions
Download patch file Download diff file Expand all files Collapse all files

15
vasc-demo/vasc-demo-server/vasc-demo-server-build/src/main/directory/conf/vasc.d/tech-admin.xml
View file

@ -57,27 +57,36 @@
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
<v:field id="slug" backendName="SLUG"/>
<v:field id="title" backendName="TITLE"/>
<v:field id="i18n_key" backendName="I18N_KEY" vascEntryFieldType="BooleanField"/>
<!-- <v:field id="active" backendName="ACTIVE" vascEntryFieldType="BooleanField"/> -->
<v:field id="active" backendName="ACTIVE" vascEntryFieldType="BooleanField"/>
<v:field id="sitemap" backendName="SITEMAP" vascEntryFieldType="BooleanField"/>
<v:field id="roles" backendName="ROLES" list="false"/>
<v:link id="AdminVascPagePartLink" vascEntryId="AdminVascPagePart">
<v:linkParameter name="page_id" valueFieldId="id"/>
</v:link>
</v:entry>
<mm:metaModelBackend id="AdminVascPagePartBackend" dataContextProvider="${DemoManagerDataDC}" table="VASC_PAGE_PART" tableId="ID" />
<v:entry id="AdminVascPagePart" backendId="AdminVascPagePartBackend" vascGroupId="tech-admin">
<v:listOption id="part_type" backendName="PART_TYPE" vascEntryFieldType="ListField" optional="true">
<v:vascSelectItemModelEnum enumClass="net.forwardfire.vasc.demo.tech.web.pages.model.VascPagePartType" nullLabel="All"/>
</v:listOption>
<v:listOption id="active" backendName="ACTIVE" vascEntryFieldType="ListField" optional="true">
<v:vascSelectItemModelString nullLabel="All" data="TRUE,FALSE"/>
</v:listOption>
<v:field id="id" backendName="ID" list="false" editReadOnly="true" create="false"/>
<v:field id="page_id" backendName="PAGE_ID" vascEntryFieldType="ListField">
<v:vascSelectItemModel entryId="AdminVascPage" keyFieldId="id" displayFieldId="slug"/>
</v:field>
<v:field id="title" backendName="TITLE"/>
<v:field id="text" backendName="TEXT"/>
<v:field id="i18n_key" backendName="I18N_KEY" vascEntryFieldType="BooleanField"/>
<v:field id="active" backendName="ACTIVE" vascEntryFieldType="BooleanField"/>
<v:field id="sitemap" backendName="SITEMAP" vascEntryFieldType="BooleanField"/>
<v:field id="part_order" backendName="PART_ORDER" vascEntryFieldType="IntegerField"/>
<v:field id="part_type" backendName="PART_TYPE" vascEntryFieldType="ListField">
<v:vascSelectItemModelEnum enumClass="net.forwardfire.vasc.demo.tech.web.pages.model.VascPagePartType"/>
</v:field>
<v:field id="roles" backendName="ROLES" list="false"/>
</v:entry>

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

@ -24,6 +24,7 @@ package net.forwardfire.vasc.demo.server.ui;
import java.awt.AWTException;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.MenuItem;
@ -35,7 +36,9 @@ import java.awt.event.ActionListener;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.EventObject;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
@ -74,7 +77,8 @@ public class ServerGuiApplication extends SingleFrameApplication {
mainView.setComponent(statusPanel);
mainView.getFrame().setMinimumSize(new Dimension(640,480));
mainView.getFrame().setMaximumSize(new Dimension(800,600));
mainView.getFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
show(mainView);
startSystemTray();
@ -124,7 +128,11 @@ public class ServerGuiApplication extends SingleFrameApplication {
}
public void startupDone() {
statusPanel.startupDone();
try {
statusPanel.startupDone();
} finally {
getMainFrame().setCursor(Cursor.getDefaultCursor());
}
}
/**
@ -231,6 +239,39 @@ public class ServerGuiApplication extends SingleFrameApplication {
} catch (IOException e) {
}
}
// Invert focus painters
List<Object> keys = new ArrayList<Object>(UIManager.getLookAndFeelDefaults().keySet());
for (Object keyObj:keys) {
if ((keyObj instanceof String)==false) {
continue;
}
String key = (String)keyObj;
if (key.endsWith("[Focused].backgroundPainter")==false & key.endsWith("[Focused].iconPainter")==false) {
continue;
}
String preKey = key.substring(0,key.indexOf("["));
String postKey = "backgroundPainter";
if (key.contains("iconPainter")) {
postKey = "iconPainter";
}
logger.finer("Flipping painters of key: "+preKey);
Object focusPainter = UIManager.getLookAndFeelDefaults().get(preKey+"[Focused]."+postKey);
Object mouseOverPainter = UIManager.getLookAndFeelDefaults().get(preKey+"[MouseOver]."+postKey);
UIManager.getLookAndFeelDefaults().put(preKey+"[Focused]."+postKey,mouseOverPainter);
UIManager.getLookAndFeelDefaults().put(preKey+"[MouseOver]."+postKey,focusPainter);
if (key.contains("iconPainter")) {
Object focusPainterSelected = UIManager.getLookAndFeelDefaults().get(preKey+"[Focused+Selected]."+postKey);
Object mouseOverPainterSelected = UIManager.getLookAndFeelDefaults().get(preKey+"[MouseOver+Selected]."+postKey);
UIManager.getLookAndFeelDefaults().put(preKey+"[Focused+Selected]."+postKey,mouseOverPainterSelected);
UIManager.getLookAndFeelDefaults().put(preKey+"[MouseOver+Selected]."+postKey,focusPainterSelected);
}
}
return colorName;
}
}

61
vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadDialog.java
View file

@ -23,6 +23,7 @@
package net.forwardfire.vasc.demo.server.ui.load;
import java.awt.BorderLayout;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Frame;
@ -194,17 +195,22 @@ public class JLoadDialog extends JDialog implements ActionListener {
if (currentStep <= 0) {
return;
}
currentStep--;
centerPanel.removeAll();
LoadStep step = steps.get(currentStep);
centerPanel.add(step.getPanel());
topLabel.setText(step.getStepTitle());
step.setupStep(model);
SwingUtilities.updateComponentTreeUI(centerPanel);
if (currentStep==0) {
prev.setEnabled(false);
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
currentStep--;
centerPanel.removeAll();
LoadStep step = steps.get(currentStep);
centerPanel.add(step.getPanel());
topLabel.setText(step.getStepTitle());
step.setupStep(model);
SwingUtilities.updateComponentTreeUI(centerPanel);
if (currentStep==0) {
prev.setEnabled(false);
}
next.setText("Next");
} finally {
setCursor(Cursor.getDefaultCursor());
}
next.setText("Next");
}
public void gotoStepNext() {
@ -221,21 +227,26 @@ public class JLoadDialog extends JDialog implements ActionListener {
if (currentStep > steps.size()-1) {
return;
}
LoadStep step = steps.get(currentStep);
boolean result = step.performStep(model);
if (result==false) {
return;
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
LoadStep step = steps.get(currentStep);
boolean result = step.performStep(model);
if (result==false) {
return;
}
currentStep++;
centerPanel.removeAll();
step = steps.get(currentStep);
centerPanel.add(step.getPanel());
topLabel.setText(step.getStepTitle());
step.setupStep(model);
SwingUtilities.updateComponentTreeUI(centerPanel);
if (currentStep==steps.size()-1) {
next.setText("Finish");
}
prev.setEnabled(true);
} finally {
setCursor(Cursor.getDefaultCursor());
}
currentStep++;
centerPanel.removeAll();
step = steps.get(currentStep);
centerPanel.add(step.getPanel());
topLabel.setText(step.getStepTitle());
step.setupStep(model);
SwingUtilities.updateComponentTreeUI(centerPanel);
if (currentStep==steps.size()-1) {
next.setText("Finish");
}
prev.setEnabled(true);
}
}

2
vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/JLoadStepWriteFile.java
View file

@ -62,7 +62,7 @@ public class JLoadStepWriteFile extends JPanel implements LoadStep,ActionListene
}
public String getStepTitle() {
return "Select Tables";
return "Write xml to file.";
}
public JPanel getPanel() {

13
vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/java/net/forwardfire/vasc/demo/server/ui/load/LoadVascXmlWriter.java
View file

@ -223,6 +223,19 @@ public class LoadVascXmlWriter {
if (f.getEditReadOnly()!=null) {
atts.addAttribute ("", "editReadOnly", "", "", ""+f.getEditReadOnly());
}
if (f.getDefaultValue()!=null) {
atts.addAttribute ("", "defaultValue", "", "", ""+f.getDefaultValue());
}
if (f.getList()!=null) {
atts.addAttribute ("", "list", "", "", ""+f.getList());
}
if (f.getEdit()!=null) {
atts.addAttribute ("", "edit", "", "", ""+f.getEdit());
}
if (f.getCreate()!=null) {
atts.addAttribute ("", "create", "", "", ""+f.getCreate());
}
//atts.addAttribute ("", "vascGroupId", "", "", model.groupId);
xmlWriter.startElement (URI_VASC_LANG, "field", "", atts);

26
vasc-demo/vasc-demo-server/vasc-demo-server-core/src/main/resources/net/forwardfire/vasc/demo/server/ui/resources/laf-colors.properties
View file

@ -1,12 +1,18 @@
#
# Default dark red color thema for pulsefire
# yellow-purple color schema from pulsefire.
#
text=#DF0A0A
info=#370A00
control=#0A1428
nimbusBase=#00050A
nimbusFocus=#0A6428
nimbusOrange=#00960A
nimbusBorder=#34415E
nimbusDisabledText=#850F0F
nimbusLightBackground=#050A28
text=#FF9900
info=#9F3B00
control=#5B084C
nimbusBase=#3A0053
nimbusDisabledText=#3A0053
nimbusFocus=#FF6600
nimbusLightBackground=#47184D
nimbusSelectedText=#47184D
nimbusBlueGrey=#661C7D
nimbusGreen=#D2C122
nimbusBorder=#A018D8
nimbusSelectionBackground=#BF6204
ComboBox.background=#380030
TabbedPane.background=#380030