Revision 1961
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/dynobject/impl/DefaultDynObjectManager.java | ||
|---|---|---|
| 36 | 36 |
import java.util.Iterator; |
| 37 | 37 |
import java.util.List; |
| 38 | 38 |
import java.util.Map; |
| 39 |
import java.util.Objects; |
|
| 39 | 40 |
import java.util.Set; |
| 41 |
import org.apache.commons.lang3.StringUtils; |
|
| 40 | 42 |
|
| 41 | 43 |
import org.gvsig.tools.ToolsLocator; |
| 42 | 44 |
import org.gvsig.tools.dataTypes.DataTypes; |
| ... | ... | |
| 777 | 779 |
} |
| 778 | 780 |
} |
| 779 | 781 |
|
| 782 |
public boolean equals(DynObject obj1, DynObject obj2) {
|
|
| 783 |
if( !StringUtils.equalsIgnoreCase( |
|
| 784 |
obj1.getDynClass().getFullName(), |
|
| 785 |
obj2.getDynClass().getFullName()) ) {
|
|
| 786 |
return false; |
|
| 787 |
} |
|
| 788 |
for (DynField field : obj1.getDynClass().getDynFields() ) {
|
|
| 789 |
String name = field.getName(); |
|
| 790 |
if( !Objects.equals(obj1.getDynValue(name), obj2.getDynValue(name)) ) {
|
|
| 791 |
return false; |
|
| 792 |
} |
|
| 793 |
} |
|
| 794 |
return true; |
|
| 795 |
} |
|
| 796 |
|
|
| 797 |
public int hashCode(DynObject obj) {
|
|
| 798 |
DynField[] fields = obj.getDynClass().getDynFields(); |
|
| 799 |
Object[] values = new Object[fields.length]; |
|
| 800 |
int n = 0; |
|
| 801 |
for (DynField field : fields ) {
|
|
| 802 |
String name = field.getName(); |
|
| 803 |
values[n++] = obj.getDynValue(name); |
|
| 804 |
} |
|
| 805 |
return Arrays.hashCode(values); |
|
| 806 |
} |
|
| 807 |
|
|
| 808 |
@Override |
|
| 780 | 809 |
public void clear(DynObject obj) {
|
| 781 | 810 |
for (DynField field : obj.getDynClass().getDynFields() ) {
|
| 782 | 811 |
String name = field.getName(); |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/dynobject/DynObjectManager.java | ||
|---|---|---|
| 456 | 456 |
public void setAttributeValue(Object obj, String name, Object value); |
| 457 | 457 |
|
| 458 | 458 |
public void copy(DynObject source, DynObject target); |
| 459 |
|
|
| 460 |
public boolean equals(DynObject obj1, DynObject obj2); |
|
| 459 | 461 |
|
| 462 |
public int hashCode(DynObject obj); |
|
| 463 |
|
|
| 460 | 464 |
public void clear(DynObject obj); |
| 461 | 465 |
|
| 462 | 466 |
public DynField createDynField(String name); |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/resourcesstorage/FilesResourcesStorage.java | ||
|---|---|---|
| 123 | 123 |
|
| 124 | 124 |
@Override |
| 125 | 125 |
public Resource getResource(String resourceName) {
|
| 126 |
File folder = new File(this.fullPathName); |
|
| 127 |
if( folder.isDirectory() ) {
|
|
| 128 |
File fres = new File(folder,resourceName); |
|
| 129 |
return new FileResource(fres); |
|
| 130 |
} |
|
| 126 | 131 |
return new FileResource(new File(fullPathName + "." + resourceName)); |
| 127 | 132 |
} |
| 128 | 133 |
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/resourcesstorage/AbstractResourcesStorage.java | ||
|---|---|---|
| 34 | 34 |
if( n==0 ) {
|
| 35 | 35 |
multiresourceName = resourceName; |
| 36 | 36 |
} else {
|
| 37 |
multiresourceName = resourceName + "." + String.valueOf(n);
|
|
| 37 |
multiresourceName = String.valueOf(n) + "." + resourceName ;
|
|
| 38 | 38 |
} |
| 39 | 39 |
Resource res = this.getResource(multiresourceName); |
| 40 | 40 |
if( !res.exists() ) {
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.services/src/main/java/org/gvsig/tools/dynform/services/dynformfield/Bytearray/JDynFormFieldBytearray.java | ||
|---|---|---|
| 90 | 90 |
this.picker = toolsSwingManager.createByteArrayPickerController( |
| 91 | 91 |
(JTextField) jtext, |
| 92 | 92 |
jbuttonUpload, |
| 93 |
jbuttonDownload |
|
| 93 |
jbuttonDownload, |
|
| 94 |
this.getForm().getDefinition().getName()+".RAWDATA", |
|
| 95 |
null |
|
| 94 | 96 |
); |
| 95 | 97 |
if (!components.containsComponents(this.getDefinition())) {
|
| 96 | 98 |
toolsSwingManager.removeBorder(this.jbuttonDownload); |
Also available in: Unified diff