Commit 9194159c authored by Ken Edmundson's avatar Ken Edmundson
Browse files

fixed merge conflicts

parent 9525c6d9

.gitignore

+1 −28
Original line number Diff line number Diff line
@@ -7,14 +7,10 @@ 
# Unignore all dirs

!*/



<<<<<<< HEAD

!Makefile

=======

# Unignore Makefiles, and TestPreferences

!Makefile

!TestPreferences

!*/3rdParty/Makefile

>>>>>>> dev



*.cub

*.o
@@ -25,36 +21,14 @@ moc_* 
*.pb.*

*.lbl

*.img

<<<<<<< HEAD



!TestPreferences



print.prt



=======

*.kate-swp

>>>>>>> dev

object_script.*.Release

object_script.*.Debug

*_plugin_import.cpp

*.moc

ui_*.h

*.html



<<<<<<< HEAD

*/3rdParty/*

!*/3rdParty/Makefile



*/inc/*



*/bin/*



*/lib/*



*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*



=======

# ignore all files created by squish coco

*csmes
@@ -67,4 +41,3 @@ print.prt 
*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*
 
>>>>>>> dev

isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.cpp

+0 −44
Original line number Diff line number Diff line
@@ -174,16 +174,6 @@ namespace Isis { 
 *                          <li>the value to check for</li>

 *                        </ol>

 *

<<<<<<< HEAD

 * @throws IException::Unknown "Malformed dependency specification."

 * @throws IException::Unknown "Specification does not have two components

 *                              separated by [@], the type of dependency and

 *                              the name-value pair.

 * @throws IException::Unknown "Dependency type specification is invalid.

 *                              Valid types are [att] and [tag]"

 * @throws IException::Unknown "Name-value specification does not have two

 *                              components separated by [:]."

=======

 * @throws IException::Programmer "Malformed dependency specification."

 * @throws IException::Programmer "Specification does not have two components

 *                                 separated by [@], the type of dependency and
@@ -192,7 +182,6 @@ namespace Isis { 
 *                                 Valid types are [att] and [tag]"

 * @throws IException::Programmer "Name-value specification does not have two

 *                              components separated by [|]."

>>>>>>> dev

 *

 */

QStringList LabelTranslationManager::parseSpecification(QString specification) const {
@@ -200,34 +189,20 @@ QStringList LabelTranslationManager::parseSpecification(QString specification) c 
  QStringList parsedSpecification;



  try {

<<<<<<< HEAD

    QStringList typeSplit = specification.split("@", QString::SkipEmptyParts);

    QStringList colonSplit = specification.split(":", QString::SkipEmptyParts);

    if (typeSplit.size() == 2) { //handle tag@elementname:value

=======

    QStringList typeSplit = specification.split("@", QString::SkipEmptyParts); 

    QStringList barSplit = specification.split("|", QString::SkipEmptyParts);

   

    if (typeSplit.size() == 2) { //handle tag@elementname|value

>>>>>>> dev

      if (typeSplit[0].toLower() != "att" &&

          typeSplit[0].toLower() != "tag" &&

          typeSplit[0].toLower() != "new") {

        QString msg = "Dependency type specification [" + typeSplit[0] +

                      "] is invalid. Valid types are [att], [tag] and [new]";

<<<<<<< HEAD

        throw IException(IException::Unknown, msg, _FILEINFO_);

      }

      parsedSpecification.append(typeSplit[0].toLower());



      QStringList nameValueSplit = typeSplit[1].split(":", QString::SkipEmptyParts);

=======

        throw IException(IException::Programmer, msg, _FILEINFO_);

      }

      parsedSpecification.append(typeSplit[0].toLower());



      QStringList nameValueSplit = typeSplit[1].split("|", QString::SkipEmptyParts);

>>>>>>> dev

      if (nameValueSplit.size() == 2) {

        parsedSpecification.append(nameValueSplit);

      }
@@ -236,20 +211,6 @@ QStringList LabelTranslationManager::parseSpecification(QString specification) c 
      }

      else { //nameValueSplit is an unexpected value

        QString msg = "Malformed dependency specification [" + specification + "].";

<<<<<<< HEAD

        throw IException(IException::Unknown, msg, _FILEINFO_);

      }

    }

    else if (colonSplit.size() == 2) { //handle elementname:value

      parsedSpecification = colonSplit;

    }

    else if (colonSplit.size() == 1 && typeSplit.size() == 1) { //handle value with no "@" or ":" characters

      parsedSpecification = colonSplit;

    }

    else { //nameValueSplit is an unexpected value

      QString msg = " [" + specification + "] has unexpected number of '@' or ':' delimiters";

      throw IException(IException::Unknown,msg, _FILEINFO_);

=======

        throw IException(IException::Programmer, msg, _FILEINFO_);

      }

    }
@@ -262,17 +223,12 @@ QStringList LabelTranslationManager::parseSpecification(QString specification) c 
    else { //nameValueSplit is an unexpected value

      QString msg = " [" + specification + "] has unexpected number of '@' or '|' delimiters";

      throw IException(IException::Programmer,msg, _FILEINFO_);

>>>>>>> dev

    }

  }



  catch (IException &e) {

    QString msg = "Malformed dependency specification [" + specification + "].";

<<<<<<< HEAD

    throw IException(e, IException::Unknown, msg, _FILEINFO_);

=======

    throw IException(e, IException::Programmer, msg, _FILEINFO_);

>>>>>>> dev

  }



  return parsedSpecification;

isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.truth

+0 −28
Original line number Diff line number Diff line
@@ -22,41 +22,14 @@ Group = Mapping 
End_Group

End



<<<<<<< HEAD

Testing parseSpecification method: att@name:value



Testing parseSpecification method: tag@name:value

=======

Testing parseSpecification method: att@name|value



Testing parseSpecification method: tag@name|value

>>>>>>> dev



Testing parseSpecification method: att@name



Testing parseSpecification method: new@name



<<<<<<< HEAD

Testing parseSpecification method: name:value



Testing parseSpecification method: value



Testing parseSpecification method: att:name:value

**ERROR** Malformed dependency specification [att:name:value].

**ERROR** [att:name:value] has unexpected number of '@' or ':' delimiters.



Testing parseSpecification method: att@name@value

**ERROR** Malformed dependency specification [att@name@value].

**ERROR** [att@name@value] has unexpected number of '@' or ':' delimiters.



Testing parseSpecification method: not@name:value

**ERROR** Malformed dependency specification [not@name:value].

**ERROR** Dependency type specification [not] is invalid. Valid types are [att], [tag] and [new].



Testing parseSpecification method: att@name:value1:value2

**ERROR** Malformed dependency specification [att@name:value1:value2].

**ERROR** Malformed dependency specification [att@name:value1:value2].

=======

Testing parseSpecification method: name|value



Testing parseSpecification method: value
@@ -84,4 +57,3 @@ Testing parseSpecification method: not@name|value 
Testing parseSpecification method: att@name|value1|value2

**PROGRAMMER ERROR** Malformed dependency specification [att@name|value1|value2].

**PROGRAMMER ERROR** Malformed dependency specification [att@name|value1|value2].
 
>>>>>>> dev

isis/src/base/objs/LabelTranslationManager/unitTest.cpp

+0 −44
Original line number Diff line number Diff line
@@ -120,28 +120,6 @@ int main(void) { 
    e.print();

  }

  try {

<<<<<<< HEAD

    cout << endl << "Testing parseSpecification method: att@name:value" << endl;

    transMgr.parseSpecification((QString)"att@name:value");



    cout << endl << "Testing parseSpecification method: tag@name:value" << endl;

    transMgr.parseSpecification((QString)"tag@name:value");



    cout << endl << "Testing parseSpecification method: att@name" << endl;

    transMgr.parseSpecification((QString)"att@name");



    cout << endl << "Testing parseSpecification method: new@name" << endl;

    transMgr.parseSpecification((QString)"new@name");



    cout << endl << "Testing parseSpecification method: name:value" << endl;

    transMgr.parseSpecification((QString)"name:value");



    cout << endl << "Testing parseSpecification method: value" << endl;

    transMgr.parseSpecification((QString)"value");



    cout << endl << "Testing parseSpecification method: att:name:value" << endl;

    transMgr.parseSpecification((QString)"att:name:value");

=======

    cout << endl << "Testing parseSpecification method: att@name|value" << endl;

    transMgr.parseSpecification((QString)"att@name:value");
@@ -197,36 +175,14 @@ int main(void) { 
  try {

    cout << endl << "Testing parseSpecification method: not@name|value" << endl;

    transMgr.parseSpecification((QString)"not@name|value");

>>>>>>> dev

  }

  catch(IException &e) {

    e.print();

  }



  try {

<<<<<<< HEAD

    cout << endl << "Testing parseSpecification method: att@name@value" << endl;

    transMgr.parseSpecification((QString)"att@name@value");

  }

  catch(IException &e) {

    e.print();

  }



  try {

    cout << endl << "Testing parseSpecification method: not@name:value" << endl;

    transMgr.parseSpecification((QString)"not@name:value");

  }

  catch(IException &e) {

    e.print();

  }



  try {

    cout << endl << "Testing parseSpecification method: att@name:value1:value2" << endl;

    transMgr.parseSpecification((QString)"att@name:value1:value2");

=======

    cout << endl << "Testing parseSpecification method: att@name|value1|value2" << endl;

    transMgr.parseSpecification((QString)"att@name|value1|value2");

>>>>>>> dev

  }

  catch(IException &e) {

    e.print();

isis/src/base/objs/ProcessExportPds4/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
ifeq ($(ISISROOT), $(BLANK))

.SILENT:

error:

	echo "Please set ISISROOT";

else

	include $(ISISROOT)/make/isismake.objs

endif