ff-attic/imxmi
2
0
Fork 0
Code Activity

WIP: left over open files for long...

Browse source
This commit is contained in:
Willem 2017-06-10 02:22:01 +02:00
parent 0a2398c5c1
commit 76aa74990e
165 changed files with 4299 additions and 3373 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vasc-frontend/vasc-frontend-swt/pom.xml
View file

@ -14,6 +14,11 @@
<artifactId>vasc-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.forwardfire.vasc</groupId>
<artifactId>vasc-frontend-api</artifactId>
<version>${project.version}</version>
</dependency>
<!-- SWT depency TODO: linux only, wait for 3.4 !!
<dependency>
<groupId>org.eclipse.swt.gtk.linux</groupId>

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

@ -25,10 +25,10 @@ package net.forwardfire.vasc.frontend.swt;
import java.io.Serializable;
import java.util.List;
import net.forwardfire.vasc.backend.select.VascBackendSelectItem;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.actions.GlobalVascAction;
import net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener;
import net.forwardfire.vasc.core.ui.VascSelectItem;
import net.forwardfire.vasc.frontend.VascFrontendPageInfoNumber;
import org.eclipse.swt.SWT;

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

@ -128,7 +128,7 @@ public class SwtVascEditDialog extends Dialog {
String name = null;
try {
Serializable bean = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
name = dis.getVascEntryFieldValue().getDisplayValue(dis.getBackendName(), bean);
name = ""+dis.getVascEntryFieldValue().getValue(dis.getBackendName(), bean);
} catch (VascBackendException e) {
throw new RuntimeException("Could not display value from "+entry.getId(),e);
}

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

@ -656,7 +656,7 @@ public class SwtVascFrontend extends AbstractVascFrontend {
//if (vtc.getVascColumnRenderer()==null) {
try {
return vtc.getVascEntryFieldValue().getDisplayValue(vtc.getBackendName(),(Serializable) bean);
return ""+vtc.getVascEntryFieldValue().getValue(vtc.getBackendName(),(Serializable) bean);
} catch (Exception e) {
logger.log(Level.WARNING,"Error in get value: '"+vtc.getVascEntryFieldValue()+"' error: "+e.getMessage(),e);
return "Err";

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

@ -25,9 +25,9 @@ package net.forwardfire.vasc.frontend.swt.ui;
import java.util.List;
import net.forwardfire.vasc.backend.select.VascBackendSelectItem;
import net.forwardfire.vasc.core.VascEntry;
import net.forwardfire.vasc.core.VascEntryField;
import net.forwardfire.vasc.core.ui.VascSelectItem;
import net.forwardfire.vasc.core.ui.VascSelectItemModel;
import net.forwardfire.vasc.core.ui.VascUIComponent;
import net.forwardfire.vasc.core.ui.VascValueModel;
@ -54,7 +54,7 @@ public class SwtList implements VascUIComponent {
private Combo combo = null;
private Color orgBackgroundColor = null;
private Color errorColor = null;
private List<VascSelectItem> data = null;
private List<VascBackendSelectItem> data = null;
@Override
public Object createComponent(final VascEntry entry,VascEntryField entryField,final VascValueModel model,Object gui) throws VascException {
@ -70,7 +70,7 @@ public class SwtList implements VascUIComponent {
combo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
VascSelectItem item = findItem(combo.getText());
VascBackendSelectItem item = findItem(combo.getText());
if (item!=null) {
try {
model.setValue(item.getValue());
@ -82,7 +82,7 @@ public class SwtList implements VascUIComponent {
});
// sets default selected
for (VascSelectItem i:data) {
for (VascBackendSelectItem i:data) {
Object iValue = i.getValue();
Object mValue = model.getValue();
if (iValue==null && mValue==null) {
@ -107,7 +107,7 @@ public class SwtList implements VascUIComponent {
if (data==null | combo==null) {
return;
}
for (VascSelectItem i:data) {
for (VascBackendSelectItem i:data) {
if (i.isDisabled()) {
continue;
}
@ -115,8 +115,8 @@ public class SwtList implements VascUIComponent {
}
}
private VascSelectItem findItem(String text) {
for (VascSelectItem i:data) {
private VascBackendSelectItem findItem(String text) {
for (VascBackendSelectItem i:data) {
if (i.getLabel().equals(text)) {
return i;
}