wip commit with working vasc demo tech

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

@@ -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;
 	}

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

@@ -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());
 	}

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

@@ -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());

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

@@ -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);

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

@@ -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 
 	}
 
 	/**

vasc-frontend/vasc-frontend-swing/src/main/resources/com/michaelbaranov/microba/calendar/DefaultCalendarResources.properties

@@ -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
+
+