From 01d2e3814c76bca2398c513b62fd6bfbf1a9bdf6 Mon Sep 17 00:00:00 2001
From: Mathieu Bastian <mathieu.bastian@gmail.com>
Date: Mon, 26 Sep 2011 21:59:27 -0700
Subject: [PATCH] Really fix bug 857595

---
 .../src/org/gephi/data/attributes/AttributeRowImpl.java   | 2 +-
 .../attributes/serialization/AttributeRowSerializer.java  | 2 +-
 DesktopProject/nbproject/genfiles.properties              | 4 ++--
 DesktopProject/nbproject/project.xml                      | 8 --------
 .../gephi/desktop/project/ProjectControllerUIImpl.java    | 5 +----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/AttributesImpl/src/org/gephi/data/attributes/AttributeRowImpl.java b/AttributesImpl/src/org/gephi/data/attributes/AttributeRowImpl.java
index d9f14cca1..42d6dbf52 100644
--- a/AttributesImpl/src/org/gephi/data/attributes/AttributeRowImpl.java
+++ b/AttributesImpl/src/org/gephi/data/attributes/AttributeRowImpl.java
@@ -107,7 +107,7 @@ public void setValue(AttributeValue value) {
         if (attributeTable.getColumn(column.getIndex()) != column) {
             column = attributeTable.getColumn(column);
             if (column == null) {
-                throw new IllegalArgumentException("The value column doesn't exist");
+                throw new IllegalArgumentException("The "+attributeTable.getName()+" value column "+value.getColumn().getId()+" with index "+value.getColumn().getIndex()+" doesn't exist");
             }
             value = attributeTable.getFactory().newValue(column, value.getValue());
         }
diff --git a/AttributesImpl/src/org/gephi/data/attributes/serialization/AttributeRowSerializer.java b/AttributesImpl/src/org/gephi/data/attributes/serialization/AttributeRowSerializer.java
index 63f14af95..d5d4831dc 100644
--- a/AttributesImpl/src/org/gephi/data/attributes/serialization/AttributeRowSerializer.java
+++ b/AttributesImpl/src/org/gephi/data/attributes/serialization/AttributeRowSerializer.java
@@ -157,7 +157,7 @@ public void readRow(XMLStreamReader reader, AbstractAttributeModel model, Attrib
                         AttributeType type = col.getType();
                         Object v = type.parse(value);
                         v = model.getManagedValue(v, type);
-                        row.setValue(col, value);
+                        row.setValue(col, v);
                     }
                     value = "";
                     col = null;
diff --git a/DesktopProject/nbproject/genfiles.properties b/DesktopProject/nbproject/genfiles.properties
index 3b342cac1..54acffc29 100644
--- a/DesktopProject/nbproject/genfiles.properties
+++ b/DesktopProject/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=2d04b18c
+build.xml.data.CRC32=4f2cd888
 build.xml.script.CRC32=6d746a4b
 build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2d04b18c
+nbproject/build-impl.xml.data.CRC32=4f2cd888
 nbproject/build-impl.xml.script.CRC32=a2d36245
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
diff --git a/DesktopProject/nbproject/project.xml b/DesktopProject/nbproject/project.xml
index 90f02d8af..b1389189b 100644
--- a/DesktopProject/nbproject/project.xml
+++ b/DesktopProject/nbproject/project.xml
@@ -6,14 +6,6 @@
             <code-name-base>org.gephi.desktop.project</code-name-base>
             <suite-component/>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>org.gephi.data.attributes.api</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>0.8.0.2</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.gephi.desktop.mrufiles.api</code-name-base>
                     <build-prerequisite/>
diff --git a/DesktopProject/src/org/gephi/desktop/project/ProjectControllerUIImpl.java b/DesktopProject/src/org/gephi/desktop/project/ProjectControllerUIImpl.java
index 8fde003e6..d4d9cafda 100644
--- a/DesktopProject/src/org/gephi/desktop/project/ProjectControllerUIImpl.java
+++ b/DesktopProject/src/org/gephi/desktop/project/ProjectControllerUIImpl.java
@@ -28,11 +28,11 @@ License, or (at your option) any later version.
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import org.gephi.data.attributes.api.AttributeController;
 import org.gephi.desktop.importer.api.ImportControllerUI;
 import org.gephi.desktop.mrufiles.api.MostRecentFiles;
 import org.gephi.desktop.project.api.ProjectControllerUI;
 import org.gephi.io.importer.api.FileType;
+import org.gephi.io.importer.api.ImportController;
 import org.gephi.project.api.Project;
 import org.gephi.project.api.ProjectController;
 import org.gephi.project.api.ProjectInformation;
@@ -83,9 +83,6 @@ public class ProjectControllerUIImpl implements ProjectControllerUI {
     public ProjectControllerUIImpl() {
 
         controller = Lookup.getDefault().lookup(ProjectController.class);
-        
-        //Make sure the attribute controller is inited
-        AttributeController attributeController = Lookup.getDefault().lookup(AttributeController.class);
 
         //Project IO executor
         longTaskExecutor = new LongTaskExecutor(true, "Project IO");