update cache and merge in changes
Merge remote branch 'upstream/master'

Conflicts:
	eclgui/pom.xml
	perspectives/pom.xml
	pom.xml
merge upstream
	new file:   .settings/org.eclipse.core.resources.prefs
	new file:   .settings/org.eclipse.m2e.core.prefs
	modified:   ecldirect/src/main/java/org/hpccsystems/ecldirect/Dataset.java
	modified:   ecldirect/src/main/java/org/hpccsystems/ecldirect/ECLSoap.java
	modified:   ecldirect/src/main/java/org/hpccsystems/ecldirect/Iterate.java
	new file:   ecldirect/src/main/java/org/hpccsystems/ecldirect/ML_BuildClassify.java
	new file:   ecldirect/src/main/java/org/hpccsystems/ecldirect/ML_Classify.java
	new file:   ecldirect/src/main/java/org/hpccsystems/ecldirect/ML_NaiveBayes.java
	modified:   eclgui/.classpath
	new file:   eclgui/.settings/org.eclipse.core.resources.prefs
	new file:   eclgui/.settings/org.eclipse.jdt.core.prefs
	new file:   eclgui/.settings/org.eclipse.m2e.core.prefs
	modified:   eclgui/src/main/java/org/hpccsystems/eclguifeatures/ErrorNotices.java
	modified:   eclgui/src/main/java/org/hpccsystems/eclguifeatures/RecordLabels.java
	new file:   job/.settings/org.eclipse.core.resources.prefs
	new file:   job/.settings/org.eclipse.m2e.core.prefs
	renamed:    job/eclmlclassification/.classpath -> job/ecldataset/.classpath
	new file:   job/ecldataset/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecldataset/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecldataset/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecldataset/src/main/java/org/hpccsystems/pentaho/job/ecldataset/ECLDataset.java
	modified:   job/ecldataset/src/main/java/org/hpccsystems/pentaho/job/ecldataset/ECLDatasetDialog.java
	modified:   job/ecldataset/src/main/resources/plugin/plugin.xml
	modified:   job/ecldedup/.classpath
	new file:   job/ecldedup/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecldedup/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecldedup/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecldedup/pom.xml
	deleted:    job/ecldedup/src/main/resources/plugin/dataset.png
	new file:   job/ecldedup/src/main/resources/plugin/dedup.png
	modified:   job/ecldedup/src/main/resources/plugin/plugin.xml
	modified:   job/ecldistribute/.classpath
	new file:   job/ecldistribute/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecldistribute/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecldistribute/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecldistribute/pom.xml
	deleted:    job/ecldistribute/src/main/resources/plugin/dataset.png
	new file:   job/ecldistribute/src/main/resources/plugin/distribute.png
	modified:   job/ecldistribute/src/main/resources/plugin/plugin.xml
	modified:   job/eclexecute/.classpath
	new file:   job/eclexecute/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclexecute/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclexecute/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclexecute/pom.xml
	copied:     job/eclexecute/src/main/resources/plugin/output.png -> job/eclexecute/src/main/resources/plugin/execute.png
	modified:   job/eclexecute/src/main/resources/plugin/plugin.xml
	modified:   job/eclgeneric/.classpath
	new file:   job/eclgeneric/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclgeneric/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclgeneric/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclgeneric/pom.xml
	deleted:    job/eclgeneric/src/main/resources/plugin/dataset.png
	new file:   job/eclgeneric/src/main/resources/plugin/eclgeneric.png
	modified:   job/eclgeneric/src/main/resources/plugin/plugin.xml
	modified:   job/eclglobalvariables/.classpath
	new file:   job/eclglobalvariables/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclglobalvariables/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclglobalvariables/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclglobalvariables/pom.xml
	deleted:    job/eclglobalvariables/src/main/resources/plugin/dataset.png
	modified:   job/eclglobalvariables/src/main/resources/plugin/plugin.xml
	new file:   job/eclglobalvariables/src/main/resources/plugin/vars.png
	modified:   job/eclgroup/.classpath
	new file:   job/eclgroup/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclgroup/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclgroup/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclgroup/pom.xml
	deleted:    job/eclgroup/src/main/resources/plugin/dataset.png
	new file:   job/eclgroup/src/main/resources/plugin/group.png
	modified:   job/eclgroup/src/main/resources/plugin/plugin.xml
	renamed:    job/eclml/.classpath -> job/eclindex/.classpath
	new file:   job/eclindex/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclindex/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclindex/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclindex/pom.xml
	renamed:    job/eclexecute/src/main/resources/plugin/output.png -> job/eclindex/src/main/resources/plugin/index.png
	deleted:    job/eclindex/src/main/resources/plugin/join.png
	modified:   job/eclindex/src/main/resources/plugin/plugin.xml
	modified:   job/ecliterate/.classpath
	new file:   job/ecliterate/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecliterate/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecliterate/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecliterate/pom.xml
	deleted:    job/ecliterate/src/main/resources/plugin/dataset.png
	new file:   job/ecliterate/src/main/resources/plugin/iterate.png
	modified:   job/ecliterate/src/main/resources/plugin/plugin.xml
	modified:   job/ecljoin/.classpath
	new file:   job/ecljoin/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecljoin/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecljoin/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecljoin/src/main/resources/plugin/plugin.xml
	modified:   job/eclmergepaths/.classpath
	new file:   job/eclmergepaths/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmergepaths/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmergepaths/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclmergepaths/pom.xml
	deleted:    job/eclmergepaths/src/main/resources/plugin/join.png
	new file:   job/eclmergepaths/src/main/resources/plugin/merge.png
	modified:   job/eclmergepaths/src/main/resources/plugin/plugin.xml
	deleted:    job/eclml/src/main/java/org/hpccsystems/pentaho/job/eclml/ECLML.java
	deleted:    job/eclml/src/main/java/org/hpccsystems/pentaho/job/eclml/ECLMLDialog.java
	deleted:    job/eclml/src/main/resources/plugin/dataset.png
	deleted:    job/eclml/src/main/resources/plugin/plugin.xml
	modified:   job/eclmlassociate/.classpath
	new file:   job/eclmlassociate/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmlassociate/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmlassociate/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclmlassociate/pom.xml
	deleted:    job/eclmlassociate/src/main/resources/plugin/dataset.png
	new file:   job/eclmlassociate/src/main/resources/plugin/eclml.png
	modified:   job/eclmlassociate/src/main/resources/plugin/plugin.xml
	renamed:    job/eclmlbuildnaivebayes/.classpath -> job/eclmlbuildclassify/.classpath
	renamed:    job/eclmlclassification/.project -> job/eclmlbuildclassify/.project
	new file:   job/eclmlbuildclassify/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmlbuildclassify/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmlbuildclassify/.settings/org.eclipse.m2e.core.prefs
	renamed:    job/eclmlclassification/pom.xml -> job/eclmlbuildclassify/pom.xml
	renamed:    job/eclmlbuildnaivebayes/src/main/java/org/hpccsystems/pentaho/job/eclmlbuildnaivebayes/ECLML_BuildNaiveBayes.java -> job/eclmlbuildclassify/src/main/java/org/hpccsystems/pentaho/job/eclmlbuildclassify/ECLML_BuildClassify.java
	renamed:    job/eclmlclassification/src/main/java/org/hpccsystems/pentaho/job/eclmlclassification/ECLML_ClassificationDialog.java -> job/eclmlbuildclassify/src/main/java/org/hpccsystems/pentaho/job/eclmlbuildclassify/ECLML_BuildClassifyDialog.java
	new file:   job/eclmlbuildclassify/src/main/resources/plugin/eclml.png
	new file:   job/eclmlbuildclassify/src/main/resources/plugin/plugin.xml
	deleted:    job/eclmlbuildnaivebayes/.project
	deleted:    job/eclmlbuildnaivebayes/pom.xml
	deleted:    job/eclmlbuildnaivebayes/src/main/resources/plugin/dataset.png
	deleted:    job/eclmlbuildnaivebayes/src/main/resources/plugin/plugin.xml
	deleted:    job/eclmlclassification/src/main/resources/plugin/dataset.png
	deleted:    job/eclmlclassification/src/main/resources/plugin/plugin.xml
	copied:     job/ecldataset/.classpath -> job/eclmlclassify/.classpath
	renamed:    job/eclml/.project -> job/eclmlclassify/.project
	new file:   job/eclmlclassify/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmlclassify/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmlclassify/.settings/org.eclipse.m2e.core.prefs
	renamed:    job/eclml/pom.xml -> job/eclmlclassify/pom.xml
	renamed:    job/eclmlclassification/src/main/java/org/hpccsystems/pentaho/job/eclmlclassification/ECLML_Classification.java -> job/eclmlclassify/src/main/java/org/hpccsystems/pentaho/job/eclmlclassify/ECLML_Classify.java
	renamed:    job/eclmlbuildnaivebayes/src/main/java/org/hpccsystems/pentaho/job/eclmlbuildnaivebayes/ECLML_BuildNaiveBayesDialog.java -> job/eclmlclassify/src/main/java/org/hpccsystems/pentaho/job/eclmlclassify/ECLML_ClassifyDialog.java
	new file:   job/eclmlclassify/src/main/resources/plugin/eclml.png
	new file:   job/eclmlclassify/src/main/resources/plugin/plugin.xml
	modified:   job/eclmldiscretize/.classpath
	new file:   job/eclmldiscretize/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmldiscretize/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmldiscretize/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclmldiscretize/pom.xml
	deleted:    job/eclmldiscretize/src/main/resources/plugin/dataset.png
	new file:   job/eclmldiscretize/src/main/resources/plugin/eclml.png
	modified:   job/eclmldiscretize/src/main/resources/plugin/plugin.xml
	modified:   job/eclmlfromfield/.classpath
	new file:   job/eclmlfromfield/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmlfromfield/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmlfromfield/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclmlfromfield/pom.xml
	deleted:    job/eclmlfromfield/src/main/resources/plugin/dataset.png
	new file:   job/eclmlfromfield/src/main/resources/plugin/eclml.png
	modified:   job/eclmlfromfield/src/main/resources/plugin/plugin.xml
	modified:   job/eclmlkmeans/.classpath
	new file:   job/eclmlkmeans/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmlkmeans/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmlkmeans/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclmlkmeans/pom.xml
	deleted:    job/eclmlkmeans/src/main/resources/plugin/dataset.png
	new file:   job/eclmlkmeans/src/main/resources/plugin/eclml.png
	modified:   job/eclmlkmeans/src/main/resources/plugin/plugin.xml
	modified:   job/eclmltofield/.classpath
	new file:   job/eclmltofield/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclmltofield/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclmltofield/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclmltofield/pom.xml
	deleted:    job/eclmltofield/src/main/resources/plugin/dataset.png
	new file:   job/eclmltofield/src/main/resources/plugin/eclml.png
	modified:   job/eclmltofield/src/main/resources/plugin/plugin.xml
	modified:   job/ecloutput/.classpath
	new file:   job/ecloutput/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecloutput/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecloutput/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecloutput/pom.xml
	modified:   job/ecloutput/src/main/resources/plugin/plugin.xml
	modified:   job/eclproject/.classpath
	new file:   job/eclproject/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclproject/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclproject/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclproject/pom.xml
	deleted:    job/eclproject/src/main/resources/plugin/dataset.png
	modified:   job/eclproject/src/main/resources/plugin/plugin.xml
	new file:   job/eclproject/src/main/resources/plugin/project.png
	modified:   job/eclrollup/.classpath
	new file:   job/eclrollup/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclrollup/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclrollup/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclrollup/pom.xml
	deleted:    job/eclrollup/src/main/resources/plugin/dataset.png
	modified:   job/eclrollup/src/main/resources/plugin/plugin.xml
	new file:   job/eclrollup/src/main/resources/plugin/rollup.png
	modified:   job/eclsort/.classpath
	new file:   job/eclsort/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclsort/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclsort/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclsort/pom.xml
	deleted:    job/eclsort/src/main/resources/plugin/dataset.png
	modified:   job/eclsort/src/main/resources/plugin/plugin.xml
	new file:   job/eclsort/src/main/resources/plugin/sort.png
	modified:   job/eclsprayfile/.classpath
	new file:   job/eclsprayfile/.settings/org.eclipse.core.resources.prefs
	new file:   job/eclsprayfile/.settings/org.eclipse.jdt.core.prefs
	new file:   job/eclsprayfile/.settings/org.eclipse.m2e.core.prefs
	modified:   job/eclsprayfile/src/main/resources/plugin/plugin.xml
	modified:   job/ecltable/.classpath
	new file:   job/ecltable/.settings/org.eclipse.core.resources.prefs
	new file:   job/ecltable/.settings/org.eclipse.jdt.core.prefs
	new file:   job/ecltable/.settings/org.eclipse.m2e.core.prefs
	modified:   job/ecltable/pom.xml
	deleted:    job/ecltable/src/main/resources/plugin/dataset.png
	modified:   job/ecltable/src/main/resources/plugin/plugin.xml
	new file:   job/ecltable/src/main/resources/plugin/table.png
	modified:   job/pom.xml
	new file:   maven-eclipse-swt.zip
	new file:   perspectives/.settings/org.eclipse.core.resources.prefs
	new file:   perspectives/.settings/org.eclipse.m2e.core.prefs
	modified:   perspectives/eclresults/.classpath
	new file:   perspectives/eclresults/.settings/org.eclipse.core.resources.prefs
	new file:   perspectives/eclresults/.settings/org.eclipse.jdt.core.prefs
	new file:   perspectives/eclresults/.settings/org.eclipse.m2e.core.prefs
	new file:   run-once.bat
	new file:   run-once.sh
Updated eclgui to use the built in version of jface for spoon

	modified:   eclgui/src/main/java/org/hpccsystems/eclguifeatures/CreateTable.java
Merge branch 'master' of https://github.com/jchambers-ln/spoon-plugins into jchambers-ln-master

Conflicts:
	run-once.bat
	run-once.sh

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>