From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 21 Mar 2016 16:08:17 +0000 (+0000)
Subject: develop merge
X-Git-Tag: Release_2_10_0~293^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeatures%2FJAL-1919_mmCIF-Support;p=jalview.git

develop merge
---

8449dcdc681745be31669b83c91ca74a91f85b41
diff --cc src/jalview/ws/dbsources/PDBRestClient.java
index 7a5d241,59cbe67..dbdb01d
--- a/src/jalview/ws/dbsources/PDBRestClient.java
+++ b/src/jalview/ws/dbsources/PDBRestClient.java
@@@ -371,7 -371,7 +371,8 @@@ public class PDBRestClien
    {
      PDB_ID("PDB Id", "pdb_id", Group.CROSS_REFS), TITLE(
              "Title",
-             "title", Group.MISCELLANEOUS), MOLECULE_NAME("Molecule",
 -            "title", Group.MISCELLENOUS), MOLECULE_NAME("Molecule",
++ "title", Group.MISCELLENOUS),
++    MOLECULE_NAME("Molecule",
              "molecule_name",
              Group.NAMES_AND_TAXONOMY), MOLECULE_TYPE(
              "Molecule Type", "molecule_type", Group.NAMES_AND_TAXONOMY), MOLECULE_SEQUENCE(
@@@ -453,27 -453,27 +454,27 @@@
              Group.PROCEDURE_AND_SOFTWARE), STRUCTURE_DETERMINATION_METHOD(
              "Structure Determination Method",
              "structure_determination_method", Group.PROCEDURE_AND_SOFTWARE), SYNCHROTON_SITE(
-             "Synchrotron Site", "synchrotron_site", Group.MISCELLANEOUS), SAMPLE_PREP_METHOD(
+             "Synchrotron Site", "synchrotron_site", Group.MISCELLENOUS), SAMPLE_PREP_METHOD(
              "Sample Preparation Method", "sample_preparation_method",
              Group.PROCEDURE_AND_SOFTWARE), ENTRY_AUTHORS("Entry Authors",
-             "entry_authors", Group.MISCELLANEOUS), CITATION_TITLE(
-             "Citation Title", "citation_title", Group.MISCELLANEOUS), STRUCTURE_SOLUTION_SOFTWARE(
+             "entry_authors", Group.MISCELLENOUS), CITATION_TITLE(
+             "Citation Title", "citation_title", Group.MISCELLENOUS), STRUCTURE_SOLUTION_SOFTWARE(
              "Structure Solution Software", "structure_solution_software",
              Group.PROCEDURE_AND_SOFTWARE), ENTRY_ENTITY("Entry Entity",
-             "entry_entity", Group.MISCELLANEOUS), R_FREE("R Free", "r_free",
+             "entry_entity", Group.MISCELLENOUS), R_FREE("R Free", "r_free",
              Group.QUALITY_MEASURES), NO_OF_POLYMER_ENTITIES(
              "Number of Polymer Entities", "number_of_polymer_entities",
-             Group.MISCELLANEOUS), NO_OF_BOUND_ENTITIES(
+             Group.MISCELLENOUS), NO_OF_BOUND_ENTITIES(
              "Number of Bound Entities", "number_of_bound_entities",
-             Group.MISCELLANEOUS), CRYSTALLISATION_RESERVOIR(
+             Group.MISCELLENOUS), CRYSTALLISATION_RESERVOIR(
              "Crystallisation Reservoir", "crystallisation_reservoir",
-             Group.MISCELLANEOUS), DATA_SCALING_SW("Data Scalling Software",
-             "data_scaling_software", Group.PROCEDURE_AND_SOFTWARE), DETECTOR(
-             "Detector", "detector", Group.MISCELLANEOUS), DETECTOR_TYPE(
-             "Detector Type", "detector_type", Group.MISCELLANEOUS), MODIFIED_RESIDUE_FLAG(
+             Group.MISCELLENOUS), DATA_SCALING_SW("Data Scalling Software",
 -            "data_scaling_software", Group.PROCEDURE_AND_SOFTWARE), DETECTOR(
++            "data_scaling_software", Group.PROCEDURE_AND_SOFTWARE), DETECTOR( 
+             "Detector", "detector", Group.MISCELLENOUS), DETECTOR_TYPE(
+             "Detector Type", "detector_type", Group.MISCELLENOUS), MODIFIED_RESIDUE_FLAG(
              "Modified Residue Flag", "modified_residue_flag",
-             Group.MISCELLANEOUS), NUMBER_OF_COPIES("Number of Copies",
-             "number_of_copies", Group.MISCELLANEOUS), STRUCT_ASYM_ID(
+             Group.MISCELLENOUS), NUMBER_OF_COPIES("Number of Copies",
+             "number_of_copies", Group.MISCELLENOUS), STRUCT_ASYM_ID(
              "Struc Asym Id", "struct_asym_id",
              Group.CROSS_REFS), HOMOLOGUS_PDB_ENTITY_ID(
              "Homologus PDB Entity Id", "homologus_pdb_entity_id",