X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemeLoader.java;h=481f8092d8dfb7e1f9731eadb831add49c82d025;hb=36067eda8f713ab855b839fd4cc9af5cf36854a4;hp=abf21d22204f5ca7aceb92d8c94fdd7fd70e232d;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git
diff --git a/src/jalview/schemes/ColourSchemeLoader.java b/src/jalview/schemes/ColourSchemeLoader.java
index abf21d2..481f809 100644
--- a/src/jalview/schemes/ColourSchemeLoader.java
+++ b/src/jalview/schemes/ColourSchemeLoader.java
@@ -1,13 +1,36 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.schemes;
-import jalview.binding.JalviewUserColours;
+import jalview.xml.binding.jalview.JalviewUserColours;
import java.awt.Color;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
-import org.exolab.castor.xml.Unmarshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
public class ColourSchemeLoader
{
@@ -31,12 +54,14 @@ public class ColourSchemeLoader
InputStreamReader in = new InputStreamReader(
new FileInputStream(file), "UTF-8");
- jalview.schemabinding.version2.JalviewUserColours jucs = new jalview.schemabinding.version2.JalviewUserColours();
-
- org.exolab.castor.xml.Unmarshaller unmar = new org.exolab.castor.xml.Unmarshaller(
- jucs);
- jucs = (jalview.schemabinding.version2.JalviewUserColours) unmar
- .unmarshal(in);
+ JAXBContext jc = JAXBContext
+ .newInstance("jalview.xml.binding.jalview");
+ javax.xml.bind.Unmarshaller um = jc.createUnmarshaller();
+ XMLStreamReader streamReader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(in);
+ JAXBElement jbe = um.unmarshal(streamReader,
+ JalviewUserColours.class);
+ JalviewUserColours jucs = jbe.getValue();
/*
* non-case-sensitive colours are for 20 amino acid codes,
@@ -49,9 +74,9 @@ public class ColourSchemeLoader
String name;
int index;
- for (int i = 0; i < jucs.getColourCount(); i++)
+ for (int i = 0; i < jucs.getColour().size(); i++)
{
- name = jucs.getColour(i).getName();
+ name = jucs.getColour().get(i).getName();
if (ResidueProperties.aa3Hash.containsKey(name))
{
index = ResidueProperties.aa3Hash.get(name).intValue();
@@ -66,7 +91,7 @@ public class ColourSchemeLoader
}
Color color = new Color(
- Integer.parseInt(jucs.getColour(i).getRGB(), 16));
+ Integer.parseInt(jucs.getColour().get(i).getRGB(), 16));
if (name.toLowerCase().equals(name))
{
caseSensitive = true;
@@ -97,7 +122,7 @@ public class ColourSchemeLoader
jalview.binding.JalviewUserColours jucs = new jalview.binding.JalviewUserColours();
- jucs = JalviewUserColours.unmarshal(in);
+ jucs = jalview.binding.JalviewUserColours.unmarshal(in);
newColours = new Color[jucs.getColourCount()];