ff-attic/imxmi
2
0
Fork 0
Code Activity

added interface override annotations.

Browse source
This commit is contained in:
Willem Cazander 2014-08-24 12:22:32 +02:00
parent fc4c568b18
commit 5bbd8e4ef3
189 changed files with 1458 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

15
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java
View file

@ -91,6 +91,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
class DownloadListCellRenderer extends JLabel implements ListCellRenderer {
private static final long serialVersionUID = -2143588238414900498L;
@Override
public Component getListCellRendererComponent(JList list, Object value,int index, boolean isSelected, boolean hasFocus) {
if (value==null) {
setText("null");
@ -101,7 +102,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
}
}
@Override
public void actionPerformed(ActionEvent event) {
if (init) {
return;
@ -154,11 +155,13 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
/**
* @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes()
*/
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
}
@Override
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
init = true;
@ -231,48 +234,58 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi
}
@Override
public String getName() {
return "...";
}
@Override
public String getImage() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getId() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getHelpId() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getDescription() {
// TODO Auto-generated method stub
return null;
}
@Override
public void doGlobalAction(VascEntry vascEntry) throws VascException {
// TODO Auto-generated method stub
}
@Override
public GlobalVascAction clone() {
return this;
}
@Override
public Integer getOrder() {
// TODO Auto-generated method stub
return null;
}
@Override
public Boolean getView() {
// TODO Auto-generated method stub
return null;
}
@Override
public String getRolesView() {
// TODO Auto-generated method stub
return null;

6
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java
View file

@ -54,7 +54,8 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
add(result);
vascEntry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
@Override
public void actionPerformed(ActionEvent e) {
if (e.getSource() instanceof JButton) {
JButton but = (JButton)e.getSource();
@ -68,6 +69,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
public NextAction(boolean next) {
this.next=next;
}
@Override
public void actionPerformed(ActionEvent e) {
int pageIndex = vascEntry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex();
if (next) {
@ -82,6 +84,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
}
}
@Override
public void vascEvent(VascEntry entry, Serializable data) {
for(Component c:result.getComponents()) {
@ -153,6 +156,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis
}
}
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;

7
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelFrame.java
View file

@ -58,6 +58,7 @@ public class SwingPanelFrame implements SwingPanelIntegration {
this.addVascMenu=addVascMenu;
}
@Override
public void createNewVascView(VascEntry entry) throws VascException {
// define redering
JPanel panel = initVascView();
@ -70,12 +71,14 @@ public class SwingPanelFrame implements SwingPanelIntegration {
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = -6801954395965101748L;
@Override
public void vascEvent(VascEntry entry, Serializable data) {
if (data instanceof Exception) {
Exception e = (Exception)data;
e.printStackTrace();
}
}
@Override
public VascFrontendEventType[] getEventTypes() {
return new VascFrontendEventType[] {VascFrontendEventType.EXCEPTION};
}
@ -86,10 +89,12 @@ public class SwingPanelFrame implements SwingPanelIntegration {
openVascView(panel, entry);
}
@Override
public JPanel initVascView() {
return new JPanel();
}
@Override
public void openVascView(JPanel pane,final VascEntry entry) {
JFrame frame = new JFrame();
frame.setTitle("Vasc Edit - Swing - "+entry.getName());
@ -103,6 +108,7 @@ public class SwingPanelFrame implements SwingPanelIntegration {
for (final String id:entry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryIds()) {
JMenuItem item = new JMenuItem(id);
item.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
VascEntry ee = entry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryById(id);
@ -128,6 +134,7 @@ public class SwingPanelFrame implements SwingPanelIntegration {
panels.put(pane,frame);
}
@Override
public void closeVascView(JPanel pane,VascEntry entry) {
JFrame frame = panels.get(pane);
if (frame!=null) {

10
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelTabbed.java
View file

@ -47,6 +47,7 @@ public class SwingPanelTabbed implements SwingPanelIntegration {
this.tabbedPane=tabbedPane;
}
@Override
public void createNewVascView(VascEntry entry) throws VascException {
// define redering
JPanel panel = initVascView();
@ -58,12 +59,14 @@ public class SwingPanelTabbed implements SwingPanelIntegration {
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = -6801954395965101748L;
@Override
public void vascEvent(VascEntry entry, Serializable data) {
if (data instanceof Exception) {
Exception e = (Exception)data;
e.printStackTrace();
}
}
@Override
public VascFrontendEventType[] getEventTypes() {
return new VascFrontendEventType[] {VascFrontendEventType.EXCEPTION};
}
@ -74,15 +77,18 @@ public class SwingPanelTabbed implements SwingPanelIntegration {
openVascView(panel, entry);
}
@Override
public JPanel initVascView() {
return new JPanel();
}
@Override
public void openVascView(JPanel pane,final VascEntry entry) {
tabbedPane.addTab(entry.getName(), pane);
tabbedPane.setSelectedIndex(tabbedPane.getTabCount()-1);
}
@Override
public void closeVascView(JPanel pane,VascEntry entry) {
for (int i=0;i<tabbedPane.getTabCount();i++) {
Object tab = tabbedPane.getComponentAt(i);

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

@ -97,6 +97,7 @@ public class SwingVascEditDialog extends JPanel {
for (final VascEntryLink vle:entry.getVascEntryLinks()) {
JButton but = new JButton(vle.getName());
but.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
VascController vc = entry.getVascFrontendController().getVascController();
@ -199,6 +200,7 @@ public class SwingVascEditDialog extends JPanel {
saveButton.setText(swingFrontend.i18n("vasc.dialog.save.name"));
saveButton.setToolTipText(swingFrontend.i18n("vasc.dialog.save.tooltip"));
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent event) {
//if(entry.getVascFrontendData().getVascFrontendHelper().validateObject(entry, bean)) {
// return;
@ -223,6 +225,7 @@ public class SwingVascEditDialog extends JPanel {
cancelButton.setText(swingFrontend.i18n("vasc.dialog.cancel.name"));
cancelButton.setToolTipText(swingFrontend.i18n("vasc.dialog.cancel.tooltip"));
cancelButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent event) {
result = null;
panels.closeVascView(editView, SwingVascEditDialog.this.entry);

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

@ -109,6 +109,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#getFrontendType()
*/
@Override
public String getFrontendType() {
return "swing";
}
@ -116,6 +117,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
/**
* Add swing implmented ui components
*/
@Override
protected void addUiComponents() {
VascFrontendController vfd = getVascEntry().getVascFrontendController();
@ -154,6 +156,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
/**
* @see net.forwardfire.vasc.core.VascViewRenderer#renderEdit(net.forwardfire.vasc.core.VascEntry, java.lang.Object)
*/
@Override
public void renderEdit() throws VascFrontendException {
logger.fine("Rending Edit View");
try {
@ -186,6 +189,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
}
}
@Override
public void renderDelete() throws VascFrontendException {
Serializable rowBean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
String beanValue = rowBean.toString();
@ -218,6 +222,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
/**
* @see net.forwardfire.vasc.core.VascViewRenderer#renderExport(net.forwardfire.vasc.core.VascEntry, net.forwardfire.vasc.core.VascDataExporter)
*/
@Override
public void renderExport(VascEntryExport exporter) throws VascFrontendException {
String fileName = null;
@ -253,11 +258,11 @@ public class SwingVascFrontend extends AbstractVascFrontend {
}
}
}
/**
* @see net.forwardfire.vasc.core.VascViewRenderer#renderView(net.forwardfire.vasc.core.VascEntry)
*/
@Override
public void renderView() throws VascFrontendException {
if (initOnce==false) {
@ -356,6 +361,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
final JTextField searchField = new JTextField();
body.add(searchField);
searchField.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
String searchText = searchField.getText();
entry.getVascFrontendController().getVascFrontendActions().searchAction(searchText);
@ -363,6 +369,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
});
JButton searchButton = new JButton("Search");
searchButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
String searchText = searchField.getText();
entry.getVascFrontendController().getVascFrontendActions().searchAction(searchText);
@ -431,6 +438,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
table.getSelectionModel().addListSelectionListener(new EntrySectionListener(table));
table.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
table.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
if (e.getClickCount() == 2) {
Object o = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
@ -453,6 +461,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
table = t;
}
@Override
public void mouseClicked(MouseEvent e) {
TableColumnModel colModel = table.getColumnModel();
int columnModelIndex = colModel.getColumnIndexAtX(e.getX());
@ -470,6 +479,8 @@ public class SwingVascFrontend extends AbstractVascFrontend {
EntrySectionListener(JTable table) {
this.table = table;
}
@Override
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting()) {
return;
@ -577,6 +588,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
this.action=action;
}
@Override
public void actionPerformed(ActionEvent event) {
logger.fine("Row Action");
try {
@ -595,6 +607,7 @@ public class SwingVascFrontend extends AbstractVascFrontend {
this.action=action;
}
@Override
public void actionPerformed(ActionEvent event) {
logger.fine("Global Action");
try {

7
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingVascTableModel.java
View file

@ -48,6 +48,7 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
entry.getVascFrontendController().addVascEntryFrontendEventListener(this);
}
@Override
public void vascEvent(VascEntry entry,Serializable o) {
fireTableDataChanged();
}
@ -55,6 +56,7 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
/**
* @see javax.swing.entry.entryModel#getColumnCount()
*/
@Override
public int getColumnCount() {
int result = 0;
for(VascEntryField c:entry.getVascEntryFields()) {
@ -69,6 +71,7 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
/**
* @see javax.swing.entry.entryModel#getRowCount()
*/
@Override
public int getRowCount() {
if (entry.getVascFrontendController().getVascEntryState().getEntryDataList()==null) {
return 0;
@ -79,6 +82,7 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
/**
* @see javax.swing.entry.entryModel#getValueAt(int, int)
*/
@Override
public Object getValueAt(int rowIndex, int columnIndex) {
Serializable bean = entry.getVascFrontendController().getVascEntryState().getEntryDataList().get(rowIndex);
@ -103,7 +107,8 @@ public class SwingVascTableModel extends AbstractTableModel implements VascEntry
return "Error";
}
}
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascFrontendEventType.POST_UPDATE,VascFrontendEventType.POST_READ,VascFrontendEventType.POST_DELETE};
return result;

10
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingBoolean.java
View file

@ -50,6 +50,7 @@ public class SwingBoolean implements VascUIComponent {
private JCheckBox checkBox = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
checkBox = new JCheckBox();
orgBackgroundColor = checkBox.getBackground();
@ -64,16 +65,18 @@ public class SwingBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (checkBox==null) {
return null;
}
return checkBox.getToolTipText();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (checkBox==null) {
return;
@ -89,6 +92,7 @@ public class SwingBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !checkBox.isEnabled();
}
@ -96,6 +100,7 @@ public class SwingBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
checkBox.setEnabled(!disabled);
}
@ -103,6 +108,7 @@ public class SwingBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return checkBox.isVisible();
}
@ -110,6 +116,7 @@ public class SwingBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
checkBox.setVisible(rendered);
}
@ -126,6 +133,7 @@ class SelectActionListener implements ActionListener {
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
@Override
public void actionPerformed(ActionEvent e) {
boolean value = ((JCheckBox)e.getSource()).isSelected();
try {

7
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingButton.java
View file

@ -46,6 +46,7 @@ public class SwingButton implements VascUIComponent {
private JButton vascButton = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
vascButton = new JButton("Color");
orgBackgroundColor = vascButton.getBackground();
@ -57,6 +58,7 @@ public class SwingButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (vascButton==null) {
return null;
@ -67,6 +69,7 @@ public class SwingButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (vascButton==null) {
return;
@ -82,6 +85,7 @@ public class SwingButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !vascButton.isEnabled();
}
@ -89,6 +93,7 @@ public class SwingButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
vascButton.setEnabled(!disabled);
}
@ -96,6 +101,7 @@ public class SwingButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return vascButton.isVisible();
}
@ -103,6 +109,7 @@ public class SwingButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
vascButton.setVisible(rendered);
}

8
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingColorChooser.java
View file

@ -50,6 +50,7 @@ public class SwingColorChooser implements VascUIComponent {
private JButton colorButton = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
JButton colorButton = new JButton("Color");
orgBackgroundColor = colorButton.getBackground();
@ -61,6 +62,7 @@ public class SwingColorChooser implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (colorButton==null) {
return null;
@ -71,6 +73,7 @@ public class SwingColorChooser implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (colorButton==null) {
return;
@ -86,6 +89,7 @@ public class SwingColorChooser implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !colorButton.isEnabled();
}
@ -93,6 +97,7 @@ public class SwingColorChooser implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
colorButton.setEnabled(!disabled);
}
@ -100,6 +105,7 @@ public class SwingColorChooser implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return colorButton.isVisible();
}
@ -107,6 +113,7 @@ public class SwingColorChooser implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
colorButton.setVisible(rendered);
}
@ -125,6 +132,7 @@ class SelectActionListener3 implements ActionListener {
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
@Override
public void actionPerformed(ActionEvent e) {
if (hexEncoding==false) {
Color cur=null;

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

@ -50,6 +50,7 @@ public class SwingDate implements VascUIComponent {
private DatePicker datePicker = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
datePicker = new DatePicker();
@ -67,6 +68,7 @@ public class SwingDate implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (datePicker==null) {
return null;
@ -77,6 +79,7 @@ public class SwingDate implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (datePicker==null) {
return;
@ -92,6 +95,7 @@ public class SwingDate implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !datePicker.isEnabled();
}
@ -99,6 +103,7 @@ public class SwingDate implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
datePicker.setEnabled(!disabled);
}
@ -106,6 +111,7 @@ public class SwingDate implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return datePicker.isVisible();
}
@ -113,6 +119,7 @@ public class SwingDate implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
datePicker.setVisible(rendered);
}
@ -129,6 +136,7 @@ class SelectActionListener2 implements ActionListener {
/**
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
@Override
public void actionPerformed(ActionEvent e) {
Date value = ((DatePicker)e.getSource()).getDate();
try {

7
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingLabel.java
View file

@ -46,6 +46,7 @@ public class SwingLabel implements VascUIComponent {
private JLabel label = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
label = new JLabel();
label.setHorizontalAlignment(JLabel.TRAILING);
@ -58,6 +59,7 @@ public class SwingLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (label==null) {
return null;
@ -68,6 +70,7 @@ public class SwingLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (label==null) {
return;
@ -83,6 +86,7 @@ public class SwingLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !label.isEnabled();
}
@ -90,6 +94,7 @@ public class SwingLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
label.setEnabled(!disabled);
}
@ -97,6 +102,7 @@ public class SwingLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return label.isVisible();
}
@ -104,6 +110,7 @@ public class SwingLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
label.setVisible(rendered);
}

9
vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/ui/SwingList.java
View file

@ -55,6 +55,7 @@ public class SwingList implements VascUIComponent {
private JComboBox comboBox = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(final VascEntry entry,VascEntryField entryField,final VascValueModel model,Object gui) throws VascException {
VascSelectItemModel items = (VascSelectItemModel)entryField.getVascEntryFieldType().getDataObject();
if (items==null) {
@ -66,6 +67,7 @@ public class SwingList implements VascUIComponent {
((JComponent)gui).add(comboBox);
comboBox.setRenderer(new MyCellRenderer());
comboBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
VascSelectItem i = (VascSelectItem)((JComboBox)e.getSource()).getSelectedItem();
try {
@ -98,6 +100,7 @@ public class SwingList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (comboBox==null) {
return null;
@ -108,6 +111,7 @@ public class SwingList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (comboBox==null) {
return;
@ -123,6 +127,7 @@ public class SwingList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !comboBox.isEnabled();
}
@ -130,6 +135,7 @@ public class SwingList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
comboBox.setEnabled(!disabled);
}
@ -137,6 +143,7 @@ public class SwingList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return comboBox.isVisible();
}
@ -144,6 +151,7 @@ public class SwingList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
comboBox.setVisible(rendered);
}
@ -157,6 +165,7 @@ class MyCellRenderer extends JLabel implements ListCellRenderer {
setOpaque(true);
}
@Override
public Component getListCellRendererComponent(JList list,Object value,int index,boolean isSelected,boolean cellHasFocus) {
VascSelectItem i = (VascSelectItem)value;
if (i!=null) {

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

@ -48,6 +48,7 @@ public class SwingText implements VascUIComponent {
private JTextField textField = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
textField = new JTextField();
Integer sizeEdit = entryField.getSizeEdit();
@ -64,6 +65,7 @@ public class SwingText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (textField==null) {
return null;
@ -74,6 +76,7 @@ public class SwingText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (textField==null) {
return;
@ -89,13 +92,15 @@ public class SwingText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !textField.isEnabled();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
textField.setEnabled(!disabled);
}
@ -103,13 +108,15 @@ public class SwingText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return textField.isVisible();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
textField.setVisible(rendered);
}
@ -130,6 +137,7 @@ class TextListener implements DocumentListener {
/**
* @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent)
*/
@Override
public void changedUpdate(DocumentEvent e) {
update(e);
}
@ -137,6 +145,7 @@ class TextListener implements DocumentListener {
/**
* @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
*/
@Override
public void insertUpdate(DocumentEvent e) {
update(e);
}
@ -144,6 +153,7 @@ class TextListener implements DocumentListener {
/**
* @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent)
*/
@Override
public void removeUpdate(DocumentEvent e) {
update(e);
}

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

@ -48,6 +48,7 @@ public class SwingTextArea implements VascUIComponent {
private JTextArea textArea = null;
private Color orgBackgroundColor = null;
@Override
public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
int colsNum = 40;
int rowsNum = 8;
@ -81,6 +82,7 @@ public class SwingTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (textArea==null) {
return null;
@ -91,6 +93,7 @@ public class SwingTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (textArea==null) {
return;
@ -106,6 +109,7 @@ public class SwingTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !textArea.isEnabled();
}
@ -113,6 +117,7 @@ public class SwingTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
textArea.setEnabled(!disabled);
}
@ -120,13 +125,15 @@ public class SwingTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return textArea.isVisible();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
textArea.setVisible(rendered);
}
@ -145,6 +152,7 @@ class TextAreaListener implements DocumentListener {
/**
* @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent)
*/
@Override
public void changedUpdate(DocumentEvent e) {
update(e);
}
@ -152,6 +160,7 @@ class TextAreaListener implements DocumentListener {
/**
* @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
*/
@Override
public void insertUpdate(DocumentEvent e) {
update(e);
}
@ -159,6 +168,7 @@ class TextAreaListener implements DocumentListener {
/**
* @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent)
*/
@Override
public void removeUpdate(DocumentEvent e) {
update(e);
}

3
vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/SwingTestTabbed.java
View file

@ -40,7 +40,6 @@ import net.forwardfire.vasc.frontend.swing.SwingPanelIntegration;
import net.forwardfire.vasc.frontend.swing.SwingPanelTabbed;
import net.forwardfire.vasc.impl.DefaultVascFactory;
import net.forwardfire.vasc.test.frontend.data.TestModelData;
import junit.framework.TestCase;
/**
@ -84,6 +83,7 @@ public class SwingTestTabbed extends TestCase {
for (final String id:vc.getVascEntryController().getVascEntryIds()) {
JMenuItem item = new JMenuItem(id);
item.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
VascEntryLocal ve = (VascEntryLocal)vc.getVascEntryController().getVascEntryById(id);
@ -99,6 +99,7 @@ public class SwingTestTabbed extends TestCase {
}
JMenuItem item = new JMenuItem("Close tab.");
item.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (pane.getSelectedIndex()>=0) {
pane.removeTabAt(pane.getSelectedIndex()); // todo release vasc frontend

5
vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/Test.java
View file

@ -40,6 +40,7 @@ public class Test implements ActionListener {
frame.setVisible(true);
}
@Override
public void actionPerformed(ActionEvent e) {
JLabel label = null;
final JPanel panel = new JPanel();
@ -59,8 +60,8 @@ public class Test implements ActionListener {
JButton tabClose = new JButton(close);
tabClose.setPreferredSize(size);
tabClose.addActionListener(new ActionListener() {
public void
actionPerformed(ActionEvent e) {
@Override
public void actionPerformed(ActionEvent e) {
int tNum = tabPane.indexOfComponent(panel);
tabPane.removeTabAt(tNum);
}

5
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java
View file

@ -78,6 +78,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
rowNumberField = new Text(actionRow, SWT.NONE | SWT.BORDER);
rowNumberField.setText(""+entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize()+" ");
rowNumberField.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent arg0) {
if (vascEvent) {
return;
@ -93,6 +94,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
l.setText("Goto: ");
pageBox = new Combo(actionRow,SWT.SINGLE | SWT.BORDER);
pageBox.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
entry.getVascFrontendController().getVascFrontendActions().pageAction(pageBox.getSelectionIndex()-1);
pageBox.select(0);
@ -107,6 +109,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
downloadBox.add(a.getName());
}
downloadBox.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
downloadBox.select(0);
@ -121,11 +124,13 @@ public class SwtActionPanel implements VascEntryFrontendEventListener {
/**
* @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes()
*/
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
}
@Override
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
vascEvent = true;

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java
View file

@ -72,11 +72,13 @@ public class SwtPagerPanel implements VascEntryFrontendEventListener {
/**
* @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes()
*/
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
}
@Override
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
}

2
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java
View file

@ -208,6 +208,7 @@ public class SwtVascEditDialog extends Dialog {
saveButton.setText(i18n("vasc.action.saveAction.name"));
saveButton.setToolTipText(i18n("vasc.action.saveAction.description"));
saveButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
try {
boolean error = entry.getVascFrontendController().getVascFrontendHelper().validateAndSetErrorText(entry);
@ -226,6 +227,7 @@ public class SwtVascEditDialog extends Dialog {
cancelButton.setText(i18n("vasc.action.cancelAction.name"));
cancelButton.setToolTipText(i18n("vasc.action.cancelAction.description"));
cancelButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
entry.getVascFrontendController().getVascEntryState().setEntryDataObject(null);
shell.dispose();

35
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java
View file

@ -111,6 +111,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#getFrontendType()
*/
@Override
public String getFrontendType() {
return "swt";
}
@ -118,6 +119,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* Add swt implmented ui components
*/
@Override
protected void addUiComponents() {
VascFrontendController vfd = getVascEntry().getVascFrontendController();
@ -165,6 +167,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/** These filter extensions are used to filter which files are displayed. */
private static final String[] FILTER_EXTS = { "*.*","*.csv","*.xls" };
@Override
public void renderExport(VascEntryExport exporter) throws VascFrontendException {
FileDialog dlg = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE);
dlg.setFilterNames(FILTER_NAMES);
@ -197,6 +200,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
}
}
@Override
public void renderEdit() throws VascFrontendException {
logger.fine("Rending Edit View");
SwtVascEditDialog dialog = new SwtVascEditDialog(entry);
@ -207,6 +211,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
}
}
@Override
public void renderDelete() throws VascFrontendException {
boolean del = askDelete( Display.getCurrent().getActiveShell() );
if (del==false) {
@ -227,7 +232,8 @@ public class SwtVascFrontend extends AbstractVascFrontend {
}
return false;
}
@Override
public void renderView() throws VascFrontendException {
if (initOnce) {
return;
@ -350,6 +356,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
model.addListener(new VascOptionValueModelListener(option));
model.setValue(option.getDefaultValue());
model.addListener(new VascValueModelListener() {
@Override
public void valueUpdate(VascValueModel model) throws VascException {
entry.getVascFrontendController().getVascFrontendActions().refreshData();// mm
}
@ -374,6 +381,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
final Text text = new Text(headerRightOptions, SWT.NONE | SWT.BORDER );
text.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
String value = text.getText();
entry.getVascFrontendController().getVascFrontendActions().searchAction(value);
@ -434,12 +442,14 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
*/
@Override
public void widgetDefaultSelected(SelectionEvent e) {
}
/**
* @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
*/
@Override
public void widgetSelected(SelectionEvent e) {
Serializable data = (Serializable) e.item.getData();
logger.fine("Slecting data: "+data);
@ -455,6 +465,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
//Add sort indicator and sort data when column selected
Listener sortListener = new Listener() {
@Override
public void handleEvent(Event e) {
// determine new sort column and direction
TableColumn sortColumn = table2.getSortColumn();
@ -474,10 +485,12 @@ public class SwtVascFrontend extends AbstractVascFrontend {
entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() {
private static final long serialVersionUID = -5558286028449368490L;
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ};
return result;
}
@Override
public void vascEvent(VascEntry entry,Serializable data) {
tableViewer.refresh();
table2.deselectAll();
@ -526,6 +539,8 @@ public class SwtVascFrontend extends AbstractVascFrontend {
this.comp=comp;
this.table=table;
}
@Override
public void controlResized(ControlEvent e) {
Rectangle area = comp.getClientArea();
Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
@ -551,6 +566,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
//column2.setWidth(width - column1.getWidth());
}
}
@Override
public void controlMoved(ControlEvent e) {
}
@ -610,6 +626,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
@Override
public Image getColumnImage(Object arg0, int arg1) {
return null;
}
@ -617,6 +634,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
*/
@Override
public String getColumnText(Object bean, int columnNumber) {
int col=0;
@ -651,18 +669,21 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
*/
@Override
public void addListener(ILabelProviderListener arg0) {
}
/**
* @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
*/
@Override
public void dispose() {
}
/**
* @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
*/
@Override
public boolean isLabelProperty(Object arg0, String arg1) {
return false;
}
@ -670,31 +691,33 @@ public class SwtVascFrontend extends AbstractVascFrontend {
/**
* @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
*/
@Override
public void removeListener(ILabelProviderListener arg0) {
}
}
class ListConverterContentProvider implements IStructuredContentProvider {
/**
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
@Override
public Object[] getElements(Object obj) {
return ((VascEntry)obj).getVascFrontendController().getVascEntryState().getEntryDataList().toArray();
}
/**
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
@Override
public void dispose() {
}
/**
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
@Override
public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
}
}
}

8
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtBoolean.java
View file

@ -50,6 +50,7 @@ public class SwtBoolean implements VascUIComponent {
private Color orgBackgroundColor = null;
private Color errorColor = null;
@Override
public Object createComponent(final VascEntry entry,VascEntryField entryField,final VascValueModel model,Object gui) throws VascException {
button = new Button((Composite)gui, SWT.CHECK);
orgBackgroundColor = button.getBackground();
@ -62,6 +63,7 @@ public class SwtBoolean implements VascUIComponent {
}
//button.setToolTipText(i18n("vasc.dialog.save.tooltip"));
button.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Boolean value = button.getSelection();
try {
@ -78,6 +80,7 @@ public class SwtBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (button==null) {
return null;
@ -88,6 +91,7 @@ public class SwtBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (button==null) {
return;
@ -103,6 +107,7 @@ public class SwtBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !button.isEnabled();
}
@ -110,6 +115,7 @@ public class SwtBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
button.setEnabled(!disabled);
}
@ -117,6 +123,7 @@ public class SwtBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return button.isVisible();
}
@ -124,6 +131,7 @@ public class SwtBoolean implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
button.setVisible(rendered);
}

8
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtButton.java
View file

@ -49,6 +49,7 @@ public class SwtButton implements VascUIComponent {
private Color orgBackgroundColor = null;
private Color errorColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
button = new Button((Composite)gui, SWT.NONE);
orgBackgroundColor = button.getBackground();
@ -57,6 +58,7 @@ public class SwtButton implements VascUIComponent {
button.setText(model.getValue()+"");
//button.setToolTipText(i18n("vasc.dialog.save.tooltip"));
button.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
}
});
@ -66,6 +68,7 @@ public class SwtButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (button==null) {
return null;
@ -76,6 +79,7 @@ public class SwtButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (button==null) {
return;
@ -91,6 +95,7 @@ public class SwtButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !button.isEnabled();
}
@ -98,6 +103,7 @@ public class SwtButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
button.setEnabled(!disabled);
}
@ -105,6 +111,7 @@ public class SwtButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return button.isVisible();
}
@ -112,6 +119,7 @@ public class SwtButton implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
button.setVisible(rendered);
}

7
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtLabel.java
View file

@ -46,6 +46,7 @@ public class SwtLabel implements VascUIComponent {
private Color orgBackgroundColor = null;
private Color errorColor = null;
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
label = new Label((Composite)gui, SWT.NONE);
orgBackgroundColor = label.getBackground();
@ -57,6 +58,7 @@ public class SwtLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (label==null) {
return null;
@ -67,6 +69,7 @@ public class SwtLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (label==null) {
return;
@ -82,6 +85,7 @@ public class SwtLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !label.isEnabled();
}
@ -89,6 +93,7 @@ public class SwtLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
label.setEnabled(!disabled);
}
@ -96,6 +101,7 @@ public class SwtLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return label.isVisible();
}
@ -103,6 +109,7 @@ public class SwtLabel implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
label.setVisible(rendered);
}

8
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtList.java
View file

@ -56,6 +56,7 @@ public class SwtList implements VascUIComponent {
private Color errorColor = null;
private List<VascSelectItem> data = null;
@Override
public Object createComponent(final VascEntry entry,VascEntryField entryField,final VascValueModel model,Object gui) throws VascException {
combo = new Combo((Composite)gui,SWT.SINGLE | SWT.BORDER);
combo.setVisibleItemCount(8);
@ -67,6 +68,7 @@ public class SwtList implements VascUIComponent {
orgBackgroundColor = combo.getBackground();
errorColor = new Color(((Composite)gui).getDisplay(),255,0,0);
combo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
VascSelectItem item = findItem(combo.getText());
if (item!=null) {
@ -125,6 +127,7 @@ public class SwtList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (combo==null) {
return null;
@ -135,6 +138,7 @@ public class SwtList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
if (combo==null) {
return;
@ -150,6 +154,7 @@ public class SwtList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !combo.isEnabled();
}
@ -157,6 +162,7 @@ public class SwtList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
combo.setEnabled(!disabled);
}
@ -164,6 +170,7 @@ public class SwtList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return combo.isVisible();
}
@ -171,6 +178,7 @@ public class SwtList implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
combo.setVisible(rendered);
}

10
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtText.java
View file

@ -51,6 +51,7 @@ public class SwtText implements VascUIComponent {
private Color orgBackgroundColor = null;
private Color errorColor = null;
@Override
public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
text = new Text((Composite)gui, SWT.NONE | SWT.BORDER);
orgBackgroundColor = text.getBackground();
@ -72,7 +73,8 @@ public class SwtText implements VascUIComponent {
this.model=model;
this.entry=entry;
}
@Override
public void modifyText(ModifyEvent e) {
Serializable value = text.getText();
try {
@ -86,6 +88,7 @@ public class SwtText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (text==null) {
return null;
@ -96,6 +99,7 @@ public class SwtText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String textString) {
if (text==null) {
return;
@ -111,6 +115,7 @@ public class SwtText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !text.isEnabled();
}
@ -118,6 +123,7 @@ public class SwtText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
text.setEnabled(!disabled);
}
@ -125,6 +131,7 @@ public class SwtText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return text.isVisible();
}
@ -132,6 +139,7 @@ public class SwtText implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
text.setVisible(rendered);
}

10
vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtTextArea.java
View file

@ -54,6 +54,7 @@ public class SwtTextArea implements VascUIComponent {
private Color orgBackgroundColor = null;
private Color errorColor = null;
@Override
public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
text = new Text((Composite)gui, SWT.MULTI | SWT.BORDER);
orgBackgroundColor = text.getBackground();
@ -96,7 +97,8 @@ public class SwtTextArea implements VascUIComponent {
this.model=model;
this.entry=entry;
}
@Override
public void modifyText(ModifyEvent e) {
Serializable value = text.getText();
try {
@ -110,6 +112,7 @@ public class SwtTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
if (text==null) {
return null;
@ -120,6 +123,7 @@ public class SwtTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String textString) {
if (text==null) {
return;
@ -135,6 +139,7 @@ public class SwtTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return !text.isEnabled();
}
@ -142,6 +147,7 @@ public class SwtTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
text.setEnabled(!disabled);
}
@ -149,6 +155,7 @@ public class SwtTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
return text.isVisible();
}
@ -156,6 +163,7 @@ public class SwtTextArea implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
text.setVisible(rendered);
}

20
vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java
View file

@ -64,6 +64,7 @@ import junit.framework.TestCase;
*/
public class SWTTableViewerTest extends TestCase {
@Override
public void setUp() throws Exception {
// enable all logs
//InputStream loggingProperties = this.getClass().getResourceAsStream("/META-INF/logging.properties");
@ -77,6 +78,7 @@ public class SWTTableViewerTest extends TestCase {
new PersonEditor().run();
}
@Override
public void tearDown() throws Exception {
}
@ -129,6 +131,7 @@ class PersonEditor extends ApplicationWindow {
* @param shell
* the shell
*/
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText("Person Editor");
@ -142,6 +145,7 @@ class PersonEditor extends ApplicationWindow {
* the main window
* @return Control
*/
@Override
protected Control createContents(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout(1, false));
@ -174,6 +178,7 @@ class PersonEditor extends ApplicationWindow {
// Add a new person when the user clicks button
newPerson.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
Person p = new Person();
p.setName("Name");
@ -220,6 +225,7 @@ class PersonEditor extends ApplicationWindow {
/**
* Returns the Person objects
*/
@Override
public Object[] getElements(Object inputElement) {
return ((List) inputElement).toArray();
}
@ -227,6 +233,7 @@ class PersonEditor extends ApplicationWindow {
/**
* Disposes any created resources
*/
@Override
public void dispose() {
// Do nothing
}
@ -234,6 +241,7 @@ class PersonEditor extends ApplicationWindow {
/**
* Called when the input changes
*/
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
// Ignore
}
@ -251,6 +259,7 @@ class PersonEditor extends ApplicationWindow {
* the data model
* @return Object[]
*/
@Override
public Object[] getElements(Object arg0) {
return ((GroceryList) arg0).getFoods().toArray();
}
@ -258,6 +267,7 @@ class PersonEditor extends ApplicationWindow {
/**
* Disposes any created resources
*/
@Override
public void dispose() {
// Do nothing
}
@ -272,6 +282,7 @@ class PersonEditor extends ApplicationWindow {
* @param arg2
* the new input
*/
@Override
public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
// Do nothing
}
@ -297,6 +308,7 @@ class PersonEditor extends ApplicationWindow {
* the property
* @return boolean
*/
@Override
public boolean canModify(Object element, String property) {
// Allow editing of all values
return true;
@ -311,6 +323,7 @@ class PersonEditor extends ApplicationWindow {
* the property
* @return Object
*/
@Override
public Object getValue(Object element, String property) {
Person p = (Person) element;
if (PersonEditor.NAME.equals(property))
@ -335,6 +348,7 @@ class PersonEditor extends ApplicationWindow {
* @param value
* the value
*/
@Override
public void modify(Object element, String property, Object value) {
if (element instanceof Item)
element = ((Item) element).getData();
@ -522,6 +536,7 @@ class PersonEditor extends ApplicationWindow {
* the column index
* @return Image
*/
@Override
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
@ -535,6 +550,7 @@ class PersonEditor extends ApplicationWindow {
* the column index
* @return String
*/
@Override
public String getColumnText(Object element, int columnIndex) {
Person person = (Person) element;
switch (columnIndex) {
@ -556,6 +572,7 @@ class PersonEditor extends ApplicationWindow {
* @param listener
* the listener
*/
@Override
public void addListener(ILabelProviderListener listener) {
// Ignore it
}
@ -563,6 +580,7 @@ class PersonEditor extends ApplicationWindow {
/**
* Disposes any created resources
*/
@Override
public void dispose() {
// Nothing to dispose
}
@ -577,6 +595,7 @@ class PersonEditor extends ApplicationWindow {
* the property
* @return boolean
*/
@Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
@ -587,6 +606,7 @@ class PersonEditor extends ApplicationWindow {
* @param listener
* the listener
*/
@Override
public void removeListener(ILabelProviderListener listener) {
// Ignore
}

4
vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java
View file

@ -36,6 +36,8 @@ import org.eclipse.swt.widgets.Shell;
import junit.framework.TestCase;
/**
@ -48,9 +50,11 @@ public class SWTTest extends TestCase {
private TestModelData testData = null;
@Override
public void setUp() throws Exception {
}
@Override
public void tearDown() throws Exception {
}
public void testNull() throws Exception {

6
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerEJB.java
View file

@ -100,11 +100,14 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
String value = bundle.getString(key);
data.put(key, value);
}
}
}
@Override
public Object handleGetObject(String key) {
return data.get(key);
}
@Override
public Enumeration<String> getKeys() {
return Collections.enumeration(data.keySet());
}
@ -157,6 +160,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF
/**
* @return the vascController
*/
@Override
public VascController getVascController() {
if (vascController!=null) {
return vascController;

6
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java
View file

@ -84,11 +84,14 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
String value = bundle.getString(key);
data.put(key, value);
}
}
}
@Override
public Object handleGetObject(String key) {
return data.get(key);
}
@Override
public Enumeration<String> getKeys() {
return Collections.enumeration(data.keySet());
}
@ -131,6 +134,7 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas
/**
* @return the vascController
*/
@Override
public VascController getVascController() {
if (vascController!=null) {
return vascController;

8
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java
View file

@ -47,10 +47,11 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener
public JSFVascEntryEventListener(String entrySupportVar) {
this.entrySupportVar=entrySupportVar;
}
/**
* @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes()
*/
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {
VascEntryFrontendEventListener.VascFrontendEventType.POST_READ,
@ -59,9 +60,8 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener
};
return result;
}
@Override
public void vascEvent(VascEntry entry,Serializable dataNotUsed) {
/* moved to fillVascEntryFrontend
try {

34
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java
View file

@ -384,9 +384,12 @@ public class JSFVascEntrySupportBean implements Serializable {
this.vascEntry=vascEntry;
this.actionId=actionId;
}
@Override
public void beforePhase(PhaseEvent PhaseEvent) {
}
@Override
public void afterPhase(PhaseEvent PhaseEvent) {
if (vascEntry==null) {
return;
@ -416,7 +419,8 @@ public class JSFVascEntrySupportBean implements Serializable {
vascEntry=null;
}
}
@Override
public PhaseId getPhaseId(){
return PhaseId.UPDATE_MODEL_VALUES;
}
@ -933,52 +937,52 @@ class JSFVascSupportI18nMapController implements Map<String,String> {
this.entry=entry;
}
public void clear() {
@Override
public void clear() {
}
@Override
public boolean containsKey(Object key) {
return true;
}
@Override
public boolean containsValue(Object value) {
return true;
}
@Override
public Set<Map.Entry<String, String>> entrySet() {
return null;
}
@Override
public String get(Object key) {
String result = entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue((String)key);
return result;
}
@Override
public boolean isEmpty() {
return false;
}
@Override
public Set<String> keySet() {
return null;
}
@Override
public String put(String key, String value) {
return null;
}
@SuppressWarnings("rawtypes")
@Override
public void putAll(Map m) {
}
@Override
public String remove(Object key) {
return null;
}
@Override
public int size() {
return 0;
}
@Override
public Collection<String> values() {
return null;
}
}

6
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascFrontendRenderer.java
View file

@ -57,10 +57,12 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#getFrontendType()
*/
@Override
public String getFrontendType() {
return "jsf";
}
@Override
protected void addUiComponents() {
VascFrontendController vfd = getVascEntry().getVascFrontendController();
@ -81,6 +83,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#renderDelete(java.lang.Object)
*/
@Override
public void renderDelete() throws VascFrontendException {
logger.finer("renderDelete");
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -91,6 +94,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#renderEdit(java.lang.Object)
*/
@Override
public void renderEdit() throws VascFrontendException {
logger.finer("renderEdit");
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -113,6 +117,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#renderExport(net.forwardfire.vasc.core.entry.VascEntryExport)
*/
@Override
public void renderExport(VascEntryExport exporter) throws VascFrontendException {
logger.finer("renderExport");
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -124,6 +129,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser
/**
* @see net.forwardfire.vasc.frontend.VascFrontend#renderView()
*/
@Override
public void renderView() throws VascFrontendException {
logger.finer("renderView");
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();

5
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java
View file

@ -82,6 +82,7 @@ public class JSFVascUIComponent extends UIComponentBase {
logger = Logger.getLogger(JSFVascUIComponent.class.getName());
}
@Override
public String getFamily() {
return FAMILY;
}
@ -393,10 +394,14 @@ public class JSFVascUIComponent extends UIComponentBase {
this.fieldId=fieldId;
this.value=value;
}
@Override
public VascFrontendEventType[] getEventTypes() {
VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.PRE_CREATE};
return result;
}
@Override
public void vascEvent(VascEntry entry,Serializable data) {
VascEntryField field = entry.getVascEntryFieldById(fieldId);
try {

8
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentRenderer.java
View file

@ -230,9 +230,12 @@ public class JSFVascUIComponentRenderer extends Renderer {
this.fieldId=fieldId;
logger = Logger.getLogger(VascJSFInputValidator2.class.getName());
}
@Override
public void validate(FacesContext context, UIComponent component,Object object) throws ValidatorException {
// always oke, we are runned by phase listener
}
public void validatePhase(FacesContext context, UIComponent component,Object object) throws ValidatorException {
JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(component);
VascEntry entry = comp.getVascEntry();
@ -340,10 +343,13 @@ public class JSFVascUIComponentRenderer extends Renderer {
public class ModelChangeListener implements ValueChangeListener,Serializable {
private static final long serialVersionUID = 1L;
VascValueModel model;
private final VascValueModel model;
public ModelChangeListener(VascValueModel model) {
this.model=model;
}
@Override
public void processValueChange(ValueChangeEvent event) throws AbortProcessingException {
try {
model.setValue((Serializable)event.getNewValue());

1
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentTag.java
View file

@ -70,6 +70,7 @@ public class JSFVascUIComponentTag extends UIComponentELTag {
processProperty(component, disableLinkColumns ,JSFVascUIComponent.DISABLE_LINK_COLUMNS);
}
@Override
public void release() {
super.release();
entrySupportVar = null;

5
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascValidatePhaseListener.java
View file

@ -57,6 +57,7 @@ public class JSFVascValidatePhaseListener implements PhaseListener {
private static final String SAVE_ACTION_ID_HACK = "VASC_SAVE";
@Override
public void afterPhase(PhaseEvent event) {
FacesContext context = event.getFacesContext();
@ -70,8 +71,12 @@ public class JSFVascValidatePhaseListener implements PhaseListener {
}
}
}
@Override
public void beforePhase(PhaseEvent event) {
}
@Override
public PhaseId getPhaseId() {
return PhaseId.PROCESS_VALIDATIONS;
}

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

@ -67,6 +67,7 @@ public class VascRequestFacesFilter implements Filter {
/**
* @see javax.servlet.Filter#destroy()
*/
@Override
public void destroy() {
servletContext = null;
templateFile = null;
@ -76,6 +77,7 @@ public class VascRequestFacesFilter implements Filter {
/**
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
@Override
public void init(FilterConfig config) throws ServletException {
logger = Logger.getLogger(VascRequestFacesFilter.class.getName());
servletContext = config.getServletContext();
@ -112,6 +114,7 @@ public class VascRequestFacesFilter implements Filter {
/**
* @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
*/
@Override
public void doFilter(ServletRequest servletRequest,ServletResponse servletResponse,FilterChain chain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest)servletRequest;

8
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/AbstractJSFBaseComponent.java
View file

@ -44,27 +44,31 @@ abstract public class AbstractJSFBaseComponent implements VascUIComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText()
*/
@Override
public String getErrorText() {
return "";
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String)
*/
@Override
public void setErrorText(String text) {
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered()
*/
@Override
public boolean isRendered() {
UIComponent component = (UIComponent)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
return component.isRendered();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean)
*/
@Override
public void setRendered(boolean rendered) {
// todo: disabled until templates fixes
//UIComponent component = (UIComponent)net.forwardfire.vasc.frontends.web.jsf.VascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);

5
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFBoolean.java
View file

@ -44,7 +44,8 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent;
* @version 1.0 Mar 28, 2009
*/
public class JSFBoolean extends AbstractJSFBaseComponent {
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
Application application = FacesContext.getCurrentInstance().getApplication();
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -60,6 +61,7 @@ public class JSFBoolean extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
HtmlSelectBooleanCheckbox component = (HtmlSelectBooleanCheckbox)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
return component.isDisabled();
@ -68,6 +70,7 @@ public class JSFBoolean extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
HtmlSelectBooleanCheckbox component = (HtmlSelectBooleanCheckbox)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
component.setDisabled(disabled);

5
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFLabel.java
View file

@ -41,6 +41,7 @@ import net.forwardfire.vasc.core.VascException;
*/
public class JSFLabel extends AbstractJSFBaseComponent {
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
Application application = FacesContext.getCurrentInstance().getApplication();
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -56,13 +57,15 @@ public class JSFLabel extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
return false;
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
}
}

6
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFList.java
View file

@ -53,7 +53,7 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent;
*/
public class JSFList extends AbstractJSFBaseComponent {
@Override
public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
Application application = FacesContext.getCurrentInstance().getApplication();
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -79,6 +79,7 @@ public class JSFList extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
HtmlSelectOneMenu component = (HtmlSelectOneMenu)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
return component.isDisabled();
@ -87,6 +88,7 @@ public class JSFList extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
HtmlSelectOneMenu component = (HtmlSelectOneMenu)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
component.setDisabled(disabled);
@ -121,6 +123,7 @@ class VascConverter implements Converter,Serializable {
/**
* Convert an ID to an Object
*/
@Override
public Object getAsObject(FacesContext context,UIComponent component,String value) throws ConverterException {
if (context == null) { throw new NullPointerException("context may not be null"); }
if (component == null) { throw new NullPointerException("component may not be null"); }
@ -138,6 +141,7 @@ class VascConverter implements Converter,Serializable {
/**
* Converts an Object to an ID.
*/
@Override
public String getAsString(FacesContext context,UIComponent component,Object value) throws ConverterException {
if (context == null) { throw new NullPointerException("context may not be null"); }
if (component == null) { throw new NullPointerException("component may not be null"); }

23
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFListModel.java
View file

@ -106,72 +106,95 @@ public class JSFListModel implements Serializable,List<SelectItem> {
// === LIST interface
@Override
public void add(int arg0, SelectItem arg1) {
getSelectItems().add(arg0,arg1);
}
@Override
public boolean add(SelectItem arg0) {
return getSelectItems().add(arg0);
}
@Override
public boolean addAll(Collection<? extends SelectItem> arg0) {
return getSelectItems().addAll(arg0);
}
@Override
public boolean addAll(int arg0, Collection<? extends SelectItem> arg1) {
return getSelectItems().addAll(arg0,arg1);
}
@Override
public void clear() {
getSelectItems().clear();
}
@Override
public boolean contains(Object arg0) {
return getSelectItems().contains(arg0);
}
@Override
public boolean containsAll(Collection<?> arg0) {
return getSelectItems().containsAll(arg0);
}
@Override
public SelectItem get(int index) {
return getSelectItems().get(index);
}
@Override
public int indexOf(Object arg0) {
return getSelectItems().indexOf(arg0);
}
@Override
public boolean isEmpty() {
return getSelectItems().isEmpty();
}
@Override
public Iterator<SelectItem> iterator() {
return getSelectItems().iterator();
}
@Override
public int lastIndexOf(Object arg0) {
return getSelectItems().lastIndexOf(arg0);
}
@Override
public ListIterator<SelectItem> listIterator() {
return getSelectItems().listIterator();
}
@Override
public ListIterator<SelectItem> listIterator(int arg0) {
return getSelectItems().listIterator(arg0);
}
@Override
public SelectItem remove(int arg0) {
return getSelectItems().remove(arg0);
}
@Override
public boolean remove(Object arg0) {
return getSelectItems().remove(arg0);
}
@Override
public boolean removeAll(Collection<?> arg0) {
return getSelectItems().removeAll(arg0);
}
@Override
public boolean retainAll(Collection<?> arg0) {
return getSelectItems().retainAll(arg0);
}
@Override
public SelectItem set(int arg0, SelectItem arg1) {
return getSelectItems().set(arg0, arg1);
}
@Override
public int size() {
return getSelectItems().size();
}
@Override
public List<SelectItem> subList(int arg0, int arg1) {
return getSelectItems().subList(arg0, arg1);
}
@Override
public Object[] toArray() {
return getSelectItems().toArray();
}
@Override
public <T> T[] toArray(T[] a) {
return getSelectItems().toArray(a);
}

9
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFText.java
View file

@ -48,7 +48,8 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent;
* @version 1.0 Mar 25, 2009
*/
public class JSFText extends AbstractJSFBaseComponent {
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
Application application = FacesContext.getCurrentInstance().getApplication();
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -69,14 +70,16 @@ public class JSFText extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
HtmlInputText component = (HtmlInputText)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
return component.isDisabled();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
HtmlInputText component = (HtmlInputText)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
component.setDisabled(disabled);
@ -89,6 +92,7 @@ class VascNullConverter implements Converter,Serializable {
/**
* Convert an ID to an Object
*/
@Override
public Object getAsObject(FacesContext context,UIComponent component,String value) throws ConverterException {
//System.out.println("getAsObject: "+component+" value: "+value);
if (context == null) { throw new NullPointerException("context may not be null"); }
@ -101,6 +105,7 @@ class VascNullConverter implements Converter,Serializable {
/**
* Converts an Object to an ID.
*/
@Override
public String getAsString(FacesContext context,UIComponent component,Object value) throws ConverterException {
//System.out.println("getAsString: "+component+" value: "+value);
if (context == null) { throw new NullPointerException("context may not be null"); }

5
vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFTextArea.java
View file

@ -45,6 +45,7 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent;
*/
public class JSFTextArea extends AbstractJSFBaseComponent {
@Override
public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException {
Application application = FacesContext.getCurrentInstance().getApplication();
UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot();
@ -68,14 +69,16 @@ public class JSFTextArea extends AbstractJSFBaseComponent {
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled()
*/
@Override
public boolean isDisabled() {
HtmlInputTextarea component = (HtmlInputTextarea)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
return component.isDisabled();
}
/**
* @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean)
*/
@Override
public void setDisabled(boolean disabled) {
HtmlInputTextarea component = (HtmlInputTextarea)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId);
component.setDisabled(disabled);