Commit e9004daa authored by Dorinela Dascalu's avatar Dorinela Dascalu 🌺

Merge branch 'master' into sentimentAnalysis_Florea

# Conflicts:
#	pom.xml
#	src/main/java/data/AbstractDocument.java
#	src/main/java/runtime/cscl/CreativityTest.java
#	src/main/java/services/discourse/dialogism/DialogismComputations.java
#	src/main/java/services/nlp/parsing/Parsing.java
#	src/main/java/view/widgets/ReaderBenchView.java
#	src/main/java/view/widgets/cscl/ChatView.java
#	src/main/java/view/widgets/cscl/ChatVoiceInterAnimationView.java
#	src/main/java/view/widgets/cscl/CollaborationVoiceView.java
#	src/main/java/view/widgets/cscl/VoiceSynergyView.java
#	src/main/java/view/widgets/document/SentenceLevelInterAnimationView.java
parent 6f7ae3b8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
<profile default="false" name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
<module name="ReaderBench" />
</profile>
</annotationProcessing>
......
<component name="libraryTable">
<library name="Maven: org.scala-lang:scala-library:2.10.4">
<library name="Maven: org.scala-lang:scala-library:2.10.4" type="Scala">
<properties>
<option name="languageLevel" value="Scala_2_10" />
<compiler-classpath>
<root url="file://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.10.4/scala-compiler-2.10.4.jar" />
<root url="file://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.10.4/scala-library-2.10.4.jar" />
<root url="file://$MAVEN_REPOSITORY$/org/scala-lang/scala-reflect/2.10.4/scala-reflect-2.10.4.jar" />
</compiler-classpath>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.10.4/scala-library-2.10.4.jar!/" />
</CLASSES>
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
......@@ -7,7 +10,7 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
</project>
\ No newline at end of file
This diff is collapsed.
......@@ -546,12 +546,12 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>${elasticsearch.version}</version>
<version>5.4.0</version>
</dependency>
<!-- Ths -->
<dependency>
......
package services.elasticsearch;
import org.apache.spark.network.client.TransportClient;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.index.query.MatchQueryBuilder;
......@@ -25,7 +25,7 @@ import java.util.Map;
*/
public class ElasticsearchService {
public TransportClient client;
public org.elasticsearch.client.transport.TransportClient client;
private static final String ELASTICSEARCH_HOST_ADDRESS = "141.85.232.57";
/**
......
......@@ -15,7 +15,8 @@ package view.widgets.cscl;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package view.widgets.cscl;
import javax.swing.*;
import java.awt.BorderLayout;
import java.awt.Color;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment