ff-attic/imxmi
2
0
Fork 0
Code Activity

wip commit with working vasc demo tech

Browse source
This commit is contained in:
Willem Cazander 2012-05-06 06:50:29 +02:00
parent a25e98f5d5
commit c23d14522f
100 changed files with 4356 additions and 1220 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vasc-frontend/vasc-frontend-swing/pom.xml
View file

@ -5,9 +5,7 @@
<groupId>net.forwardfire.vasc</groupId>
<version>0.3.5-SNAPSHOT</version>
</parent>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc-frontend-swing</artifactId>
<version>0.3.5-SNAPSHOT</version>
<name>vasc-frontend-swing</name>
<description>vasc-frontend-swing</description>
<dependencies>

19
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascEditDialog.java
View file

@ -23,10 +23,13 @@
package net.forwardfire.vasc.frontends.swing;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
@ -74,17 +77,21 @@ public class SwingVascEditDialog extends JPanel {
add(createBody(), BorderLayout.CENTER);
add(createFooter(), BorderLayout.SOUTH);
editView.setLayout(new FlowLayout(FlowLayout.LEFT));
editView.add(this);
}
protected JPanel createHeader() {
JPanel header = new JPanel();
header.setLayout(new BoxLayout(header,BoxLayout.PAGE_AXIS));
JLabel l = new JLabel();
l.setText(swingFrontend.i18n(headerText,headerTextValue));
l.setFont(new Font(null,Font.BOLD, 14));
//l.setToolTipText(i18n(headerText));
header.add(l);
JPanel b = new JPanel();
b.setLayout(new SpringLayout());
for (final VascLinkEntry vle:entry.getVascLinkEntries()) {
JButton but = new JButton(vle.getName());
but.addActionListener(new ActionListener() {
@ -99,20 +106,20 @@ public class SwingVascEditDialog extends JPanel {
Object selected = bean;
for (String parameterName:vle.getEntryParameterFieldIdKeys()) {
String fieldId = vle.getEntryParameterFieldId(parameterName);
VascEntryField v = ee.getVascEntryFieldById(fieldId);
VascEntryField v = entry.getVascEntryFieldById(fieldId);
if (v==null) {
System.out.println("Could nog get VascEntryField for fieldID: "+fieldId);
//System.out.println("Could not get VascEntryField for fieldID: "+fieldId);
continue;
}
if (v.getVascEntryFieldValue()==null) {
System.out.println("Could not get VascEntryFieldValue for fieldID: "+fieldId);
//System.out.println("Could not get VascEntryFieldValue for fieldID: "+fieldId);
continue;
}
Object selectedValue = v.getVascEntryFieldValue().getValue(v, selected);
// set data parameter on new vasc entry
ee.getVascFrontendData().getVascEntryState().getVascBackendState().setDataParameter(parameterName, selectedValue);
System.out.println("Setting link parameter: "+parameterName+" with: "+selectedValue);
//System.out.println("Setting link parameter: "+parameterName+" with: "+selectedValue);
}
for (String fieldId:vle.getEntryCreateFieldValueKeys()) {
@ -138,8 +145,10 @@ public class SwingVascEditDialog extends JPanel {
}
}
});
header.add(but);
b.add(but);
}
SpringUtilities.makeCompactGrid(b, b.getComponentCount(),1, 6,6, 6,6);
header.add(b);
return header;
}

3
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/SwingVascFrontend.java
View file

@ -74,6 +74,7 @@ import net.forwardfire.vasc.frontend.VascFrontendData;
import net.forwardfire.vasc.frontends.swing.ui.SwingBoolean;
import net.forwardfire.vasc.frontends.swing.ui.SwingButton;
import net.forwardfire.vasc.frontends.swing.ui.SwingColorChooser;
import net.forwardfire.vasc.frontends.swing.ui.SwingDate;
import net.forwardfire.vasc.frontends.swing.ui.SwingLabel;
import net.forwardfire.vasc.frontends.swing.ui.SwingList;
import net.forwardfire.vasc.frontends.swing.ui.SwingText;
@ -121,7 +122,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
// optional UI components
vfd.putVascUIComponent(VascUIComponent.VASC_BOOLEAN , SwingBoolean.class.getName());
//vfd.putVascUIComponent(VascUIComponent.VASC_DATE , SwingDate.class.getName());
vfd.putVascUIComponent(VascUIComponent.VASC_DATE , SwingDate.class.getName());
vfd.putVascUIComponent(VascUIComponent.VASC_TEXTAREA, SwingTextArea.class.getName());
vfd.putVascUIComponent(VascUIComponent.VASC_COLOR, SwingColorChooser.class.getName());
}

5
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingDate.java
View file

@ -36,10 +36,8 @@ import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
import com.michaelbaranov.microba.calendar.DatePicker;
/**
*
*
@ -50,9 +48,10 @@ public class SwingDate implements VascUIComponent {
private DatePicker datePicker = null;
private Color orgBackgroundColor = null;
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
datePicker = new DatePicker();
orgBackgroundColor = datePicker.getBackground();
try {
datePicker.setDate((Date)model.getValue());

4
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingText.java
View file

@ -50,6 +50,10 @@ public class SwingText implements VascUIComponent {
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
textField = new JTextField();
Integer sizeEdit = entryField.getSizeEdit();
if (sizeEdit!=null) {
textField.setColumns(sizeEdit);
}
orgBackgroundColor = textField.getBackground();
textField.setText(""+model.getValue());
((JComponent)gui).add(textField);

36
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontends/swing/ui/SwingTextArea.java
View file

@ -26,7 +26,9 @@ import java.awt.Color;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.ScrollPaneConstants;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@ -36,9 +38,6 @@ import net.forwardfire.vasc.core.VascException;
import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
/**
*
* @author Willem Cazander
@ -50,20 +49,33 @@ public class SwingTextArea implements VascUIComponent {
private Color orgBackgroundColor = null;
public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
textArea = new JTextArea();
int colsNum = 40;
int rowsNum = 8;
String cols = entryField.getVascEntryFieldType().getProperty("editor.columns");
if (cols!=null && cols.isEmpty()==false) {
colsNum = new Integer(cols);
}
String rows = entryField.getVascEntryFieldType().getProperty("editor.rows");
if (rows!=null && rows.isEmpty()==false) {
rowsNum = new Integer(rows);
}
textArea = new JTextArea(rowsNum,colsNum);
textArea.setBorder(BorderFactory.createEtchedBorder());
textArea.setRows(8);
//entryField.getVascEntryFieldType().getProperty(name)
//textArea.setRows(rows);
//textArea.setColumns(columns);
orgBackgroundColor = textArea.getBackground();
textArea.setText(""+model.getValue());
((JComponent)gui).add(textArea);
textArea.getDocument().addDocumentListener(new TextAreaListener(model,entry,this));
return textArea;
JScrollPane scrollPane = new JScrollPane(textArea);
scrollPane.setBorder(BorderFactory.createEmptyBorder());
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
scrollPane.getVerticalScrollBar().setUnitIncrement(10);
scrollPane.getHorizontalScrollBar().setUnitIncrement(10);
scrollPane.setSize(colsNum*10, rowsNum*20);
((JComponent)gui).add(scrollPane);
return scrollPane; /// TODO: mmm check return this object type
}
/**

28
vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/DefaultCalendarResources.properties Normal file
View file

@ -0,0 +1,28 @@
en.key.none=none
en.key.today=today
de.key.none=kein
de.key.today=heute
fr.key.none=non
fr.key.today=ajourd'hui
pt.key.none=limpar
pt.key.today=hoje
ru.key.none=\u043D\u0435\u0442
ru.key.today=\u0441\u0435\u0433\u043E\u0434\u043D\u044F
it.key.none=nessuno
it.key.today=oggi
nl.key.none=geen
nl.key.today=vandaag
es.key.none=ninguna
es.key.today=hoy
pl.key.none=\u017Caden
pl.key.today=dzisiaj
by.key.none=\u043Di\u0447\u043E\u0433\u0430
by.key.today=\u0441\u0451\u043D\u043D\u044F
da.key.none=ingen
da.key.today=i dag
ro.key.none=sterge
ro.key.today=azi
sv.key.none=inget
sv.key.today=idag

BIN
vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/resource/back-16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 185 B

BIN
vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/resource/back-fast-16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 193 B

BIN
vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/resource/forward-16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 B

BIN
vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/resource/forward-fast-16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 189 B

BIN
vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/resource/picker-16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 461 B

4
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/AbstractJSFVascFacesControllerBase.java
View file

@ -40,8 +40,8 @@ import net.forwardfire.vasc.impl.DefaultVascFactory;
*/
public abstract class AbstractJSFVascFacesControllerBase {
abstract VascFrontendData getNewVascFrontendData();
abstract VascController getVascController();
abstract public VascFrontendData getNewVascFrontendData();
abstract public VascController getVascController();
public void setVascController(VascController vascController) {
}

19
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontends/web/jsf/VascRequestFacesFilter.java
View file

@ -71,17 +71,18 @@ public class VascRequestFacesFilter implements Filter {
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
public void init(FilterConfig config) throws ServletException {
logger = Logger.getLogger(VascRequestFacesFilter.class.getName());
templateFile=config.getInitParameter("templateFile");
logger = Logger.getLogger(VascRequestFacesFilter.class.getName());
servletContext = config.getServletContext();
templateFile = config.getInitParameter("templateFile");
if (templateFile==null) {
throw new ServletException("No templateFile init-param found.");
}
resourceBundle=config.getInitParameter("resourceBundle");
if (resourceBundle==null) {
throw new ServletException("No resourceBundle init-param found.");
return; //throw new ServletException("No resourceBundle init-param found.");
}
ResourceBundle.getBundle(resourceBundle); // test if it loads
servletContext=config.getServletContext();
}
/**
@ -161,9 +162,13 @@ public class VascRequestFacesFilter implements Filter {
locale = new Locale("nl");
}
try {
ResourceBundle i18n = ResourceBundle.getBundle(resourceBundle,locale);
String titleI18n = i18n.getString("vasc.entry."+entityName+".name");
request.setAttribute("requestScopeVascEntityNameI18n" ,titleI18n);
if (resourceBundle!=null) {
ResourceBundle i18n = ResourceBundle.getBundle(resourceBundle,locale);
String titleI18n = i18n.getString("vasc.entry."+entityName+".name");
request.setAttribute("requestScopeVascEntityNameI18n" ,titleI18n);
} else {
request.setAttribute("requestScopeVascEntityNameI18n" ,entityName);
}
} catch (Exception e) {
e.printStackTrace();
request.setAttribute("requestScopeVascEntityNameI18n" ,entityName);