Add diff and compare dependencies

ppourali · Jun 21, 2021 · 499ed9e · 499ed9e
1 parent 8ff5fbf
commit 499ed9e
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 897 deletions.
diff --git a/.gitingnore b/.gitingnore
@@ -0,0 +1,56 @@
+#
+# Project specific excludes
+#
+
+tomcat
+
+#
+# Default excludes
+#
+
+# Binaries
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.war
+*.ear
+*.sar
+*.class
+
+# Maven 
+target/
+
+# IntelliJ project files 
+*.iml
+*.iws
+*.ipr
+.idea/
+
+# eclipse project file
+.settings/
+.classpath
+.project
+
+# NetBeans specific
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+
+# OS
+.DS_Store
+
+# Misc
+*.swp
+release.properties
+pom.xml.releaseBackup
+pom.xml.tag
diff --git a/uw.cs.watform.forml.odesign/.classpath b/uw.cs.watform.forml.odesign/.classpath
@@ -10,7 +10,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="C:/Users/p84132445/Downloads/diff-1.3.2-v20120918-1125.jar"/>
-	<classpathentry kind="lib" path="C:/Users/p84132445/Downloads/match-1.3.2-v20120918-1125.jar"/>
+	<classpathentry kind="lib" path="dependencies/diff-1.3.2-v20120918-1125.jar"/>
+	<classpathentry kind="lib" path="dependencies/match-1.3.2-v20120918-1125.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/....odesign/bin/uw/cs/watform/forml/extensions/EmbeddedLinkEditor/AbstractEditorHelper.class b/....odesign/bin/uw/cs/watform/forml/extensions/EmbeddedLinkEditor/AbstractEditorHelper.class
diff --git a/.../forml/extensions/EmbeddedLinkEditor/AbstractXtextEmbeddedEditorForPropertiesViewer.class b/.../forml/extensions/EmbeddedLinkEditor/AbstractXtextEmbeddedEditorForPropertiesViewer.class
diff --git a/...s/watform/forml/extensions/EmbeddedLinkEditor/CustomEmbeddedEditorForPropertiesView.class b/...s/watform/forml/extensions/EmbeddedLinkEditor/CustomEmbeddedEditorForPropertiesView.class
diff --git a/uw.cs.watform.forml.odesign/dependencies/diff-1.3.2-v20120918-1125.jar b/uw.cs.watform.forml.odesign/dependencies/diff-1.3.2-v20120918-1125.jar
diff --git a/uw.cs.watform.forml.odesign/dependencies/edit-1.3.2-v20120918-1125.jar b/uw.cs.watform.forml.odesign/dependencies/edit-1.3.2-v20120918-1125.jar
diff --git a/uw.cs.watform.forml.odesign/dependencies/match-1.3.2-v20120918-1125.jar b/uw.cs.watform.forml.odesign/dependencies/match-1.3.2-v20120918-1125.jar
diff --git a/uw.cs.watform.forml.viewpoint.xtext.support/pom.xml b/uw.cs.watform.forml.viewpoint.xtext.support/pom.xml
@@ -1,7 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<parent>
 		<relativePath>../..</relativePath>
 		<groupId>com.uwaterloo.cs.forml.viewpoint.xtext.support</groupId>

diff --git a/uw.cs.watform.forml/.settings/org.eclipse.core.resources.prefs b/uw.cs.watform.forml/.settings/org.eclipse.core.resources.prefs
diff --git a/uw.cs.watform.forml/.settings/org.eclipse.m2e.core.prefs b/uw.cs.watform.forml/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/uw.cs.watform.forml/bin/uw/cs/watform/forml/formatting/FormlFormatter.xtend b/uw.cs.watform.forml/bin/uw/cs/watform/forml/formatting/FormlFormatter.xtend
diff --git a/uw.cs.watform.forml/bin/uw/cs/watform/forml/generator/FormlGenerator.xtend b/uw.cs.watform.forml/bin/uw/cs/watform/forml/generator/FormlGenerator.xtend