Skip to content

Commit

Permalink
JarCriado
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielSirtoriCorrea committed Jun 20, 2020
1 parent 0ba00ea commit 25f0d77
Show file tree
Hide file tree
Showing 34 changed files with 155 additions and 14 deletions.
12 changes: 6 additions & 6 deletions Configurations.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"FridayConfigs": {
"ID": "Sexta-Feira",
"ServerHost": "gazeboindustries.hopto.org",
"Port": 3000
"ServerHost": "192.168.0.4",
"Port": 5000
},
"ServerConfigs": {
"ID": "Server",
"Host": "192.168.0.5",
"Port": 3000
"Host": "192.168.0.4",
"Port": 5000
},
"InterfaceConfigs": {
"ID": "Interface",
"ServerHost": "gazeboindustries.hopto.org",
"Port": 3000
"ServerHost": "192.168.0.4",
"Port": 5000
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -212,39 +212,39 @@ public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
@Override
public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
// TODO Auto-generated method stub
return new ReadOnlyObjectWrapper(param.getValue().get(2));
return new ReadOnlyObjectWrapper(param.getValue().get(3));
}
});

response1Column.setCellValueFactory(new Callback<CellDataFeatures<JSONArray, String>, ObservableValue<String>>() {
@Override
public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
// TODO Auto-generated method stub
return new ReadOnlyObjectWrapper(param.getValue().get(2));
return new ReadOnlyObjectWrapper(param.getValue().get(4));
}
});

response2Column.setCellValueFactory(new Callback<CellDataFeatures<JSONArray, String>, ObservableValue<String>>() {
@Override
public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
// TODO Auto-generated method stub
return new ReadOnlyObjectWrapper(param.getValue().get(2));
return new ReadOnlyObjectWrapper(param.getValue().get(5));
}
});

response3Column.setCellValueFactory(new Callback<CellDataFeatures<JSONArray, String>, ObservableValue<String>>() {
@Override
public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
// TODO Auto-generated method stub
return new ReadOnlyObjectWrapper(param.getValue().get(2));
return new ReadOnlyObjectWrapper(param.getValue().get(6));
}
});

commandColumn.setCellValueFactory(new Callback<CellDataFeatures<JSONArray, String>, ObservableValue<String>>() {
@Override
public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
// TODO Auto-generated method stub
return new ReadOnlyObjectWrapper(param.getValue().get(2));
return new ReadOnlyObjectWrapper(param.getValue().get(7));
}
});

Expand Down Expand Up @@ -387,7 +387,10 @@ public ObservableValue<String> call(CellDataFeatures<JSONArray, String> param) {
}

private void setTableData(String request){
tableView.getItems().clear();

response = (JSONObject) connection.receive(request);
System.out.println(response);

for (int c = 0; c < response.size(); c++) {
arrayResponse = (JSONArray) response.get(Integer.toString(c));
Expand Down
2 changes: 1 addition & 1 deletion Interface/Interface/src/main/resources/fxml/Scene.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Font name="Impact" size="55.0" />
</font>
</Label>
<TableView fx:id="tableView" editable="true" layoutX="72.0" layoutY="163.0" prefHeight="586.0" prefWidth="1141.0" visible="false" AnchorPane.bottomAnchor="-66.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="-11.0" AnchorPane.topAnchor="200.0">
<TableView fx:id="tableView" editable="true" layoutX="72.0" layoutY="163.0" prefHeight="494.0" prefWidth="1082.0" visible="false" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="120.0" AnchorPane.rightAnchor="80.0" AnchorPane.topAnchor="200.0">
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy></TableView>
Expand Down
Binary file added Interface/Interface/target/Interface-6.0.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Interface/Interface/target/classes/FridayInterface/MainApp.class
Binary file not shown.
Binary file not shown.
14 changes: 14 additions & 0 deletions Interface/Interface/target/classes/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Manifest-Version: 1.0
Bnd-LastModified: 1332231819873
Build-Jdk: 1.6.0_26
Built-By: fangyidong
Bundle-Description: A simple Java toolkit for JSON
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-ManifestVersion: 2
Bundle-Name: JSON.simple
Bundle-SymbolicName: com.googlecode.json-simple
Bundle-Version: 1.1.1
Created-By: Apache Maven Bundle Plugin
Export-Package: org.json.simple;uses:="org.json.simple.parser";version="
1.1.1",org.json.simple.parser;uses:="org.json.simple";version="1.1.1"
Tool: Bnd-1.50.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by org.apache.felix.bundleplugin
#Tue Mar 20 16:23:39 CST 2012
version=1.1.1
groupId=com.googlecode.json-simple
artifactId=json-simple
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<packaging>bundle</packaging>
<name>JSON.simple</name>
<version>1.1.1</version>
<description>A simple Java toolkit for JSON</description>
<url>http://code.google.com/p/json-simple/</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<developers>
<developer>
<id>Yidong</id>
<name>Yidong Fang</name>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
<timezone>+8</timezone>
</developer>
</developers>
<scm>
<connection>scm:svn:http://json-simple.googlecode.com/svn/trunk/</connection>
<developerConnection>scm:svn:http://json-simple.googlecode.com/svn/trunk/</developerConnection>
<url>http://json-simple.googlecode.com/svn/trunk/</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.6</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.2</source>
<target>1.2</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>

2 changes: 1 addition & 1 deletion Interface/Interface/target/classes/fxml/Scene.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Font name="Impact" size="55.0" />
</font>
</Label>
<TableView fx:id="tableView" editable="true" layoutX="72.0" layoutY="163.0" prefHeight="586.0" prefWidth="1141.0" visible="false" AnchorPane.bottomAnchor="-66.0" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="-11.0" AnchorPane.topAnchor="200.0">
<TableView fx:id="tableView" editable="true" layoutX="72.0" layoutY="163.0" prefHeight="494.0" prefWidth="1082.0" visible="false" AnchorPane.bottomAnchor="50.0" AnchorPane.leftAnchor="120.0" AnchorPane.rightAnchor="80.0" AnchorPane.topAnchor="200.0">
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy></TableView>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions Interface/Interface/target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Maven
#Fri Jun 19 21:33:10 BRT 2020
version=6.0
groupId=FridayInterface
artifactId=Interface
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
e:\Sexta-Feira-Mark_6\Interface\Interface\src\main\java\FridayInterface\ServerConnection.java
e:\Sexta-Feira-Mark_6\Interface\Interface\src\main\java\FridayInterface\Configurations.java
e:\Sexta-Feira-Mark_6\Interface\Interface\src\main\java\FridayInterface\MainApp.java
e:\Sexta-Feira-Mark_6\Interface\Interface\src\main\java\FridayInterface\FXMLController.java
2 changes: 1 addition & 1 deletion Server/DevicesStatus.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Interface": {
"action": 5,
"url": "E:\\Sexta-Feira-Mark_6\\Images\\Equa\u00e7\u00f5es Dinamica.png"
"url": "E:\\Sexta-Feira-Mark_6\\Images\\Brasil Pol\u00edtico.jpg"
},
"Friday": {
"action": 0,
Expand Down

0 comments on commit 25f0d77

Please sign in to comment.