Revision 474
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.swing/org.gvsig.tools.swing.spi/src/main/java/org/gvsig/tools/swing/spi/AbstractJDynFieldComponentFactory.java | ||
|---|---|---|
| 33 | 33 |
*/ |
| 34 | 34 |
package org.gvsig.tools.swing.spi; |
| 35 | 35 |
|
| 36 |
import org.gvsig.tools.dataTypes.DataTypes; |
|
| 36 | 37 |
import org.gvsig.tools.dynobject.DynClass; |
| 37 | 38 |
import org.gvsig.tools.dynobject.DynField; |
| 38 | 39 |
import org.gvsig.tools.dynobject.DynObject; |
| ... | ... | |
| 161 | 162 |
// this.getServiceManager().getJSingleReadOnlyDynFieldComponent(component, |
| 162 | 163 |
// field); |
| 163 | 164 |
// } |
| 164 |
if ((!field.getDynField().isContainer())
|
|
| 165 |
if ((!(field.getDynField().getType() == DataTypes.DYNOBJECT))
|
|
| 165 | 166 |
&& ((field.getDynField().getAvailableValues() != null))) {
|
| 166 | 167 |
return this.getServiceManager() |
| 167 | 168 |
.getJSingleComboBoxDynFieldComponent(component, field); |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.swing/org.gvsig.tools.swing.impl/src/main/java/org/gvsig/tools/swing/impl/dynobject/dynfield/JDynObjectDynFieldComponent.java | ||
|---|---|---|
| 73 | 73 |
private List<ValueChangedListener> listeners; |
| 74 | 74 |
|
| 75 | 75 |
/** |
| 76 |
* @param dynField
|
|
| 77 |
* @param dynObject2
|
|
| 78 |
* @param dynObject
|
|
| 76 |
* |
|
| 77 |
* @param dynObjectValueField
|
|
| 78 |
* @param writable
|
|
| 79 | 79 |
* @throws ServiceException |
| 80 | 80 |
*/ |
| 81 |
|
|
| 81 | 82 |
public JDynObjectDynFieldComponent(ValueField dynObjectValueField, |
| 82 | 83 |
boolean writable) throws ServiceException {
|
| 83 | 84 |
this.dynField = dynObjectValueField.getDynField(); |
| ... | ... | |
| 90 | 91 |
if (dynObject != null) |
| 91 | 92 |
this.dynClass = dynObject.getDynClass(); |
| 92 | 93 |
} |
| 94 |
LOG.info("Checking component " + getFieldName(true) + ";" + dynField.getName());
|
|
| 95 |
|
|
| 93 | 96 |
this.jDynObjectComponent = |
| 94 | 97 |
ToolsSwingLocator.getDynObjectSwingManager() |
| 95 | 98 |
.createJDynObjectComponent(getDynObject(), writable); |
| ... | ... | |
| 158 | 161 |
if (this.dynField.getType() == DataTypes.DYNOBJECT) {
|
| 159 | 162 |
name = this.dynField.getSubtype(); |
| 160 | 163 |
if (name == null) {
|
| 161 |
name = this.dynField.getElementsType().getName(); |
|
| 164 |
DynField fieldType = this.dynField.getElementsType(); |
|
| 165 |
if (fieldType != null){
|
|
| 166 |
name = this.dynField.getElementsType().getName(); |
|
| 167 |
} |
|
| 162 | 168 |
} |
| 163 | 169 |
if (name == null) {
|
| 164 | 170 |
name = this.dynField.getName(); |
Also available in: Unified diff