Skip to content
Snippets Groups Projects
Commit 1a2b73bf authored by Alexandre Vanini's avatar Alexandre Vanini
Browse files

[LAST]

parent a20c243c
No related branches found
No related tags found
No related merge requests found
Showing
with 281 additions and 101 deletions
...@@ -18,16 +18,17 @@ export class AceAssertComponent implements AfterViewInit { ...@@ -18,16 +18,17 @@ export class AceAssertComponent implements AfterViewInit {
ngAfterViewInit() { ngAfterViewInit() {
this.editor.setTheme('dracula'); this.editor.setTheme('dracula');
this.editor.getEditor().setOptions({ this.editor.getEditor().setOptions({
enableBasicAutocompletion: true enableBasicAutocompletion: true,
highlightActiveLine : false
}); });
/*
this.editor.getEditor().commands.addCommand({ this.editor.getEditor().commands.addCommand({
name: 'showOtherCompletions', name: 'showOtherCompletions',
bindKey: 'Ctrl-.', bindKey: 'Ctrl-.',
exec(editor) { exec(editor) {
} }
}); });*/
} }
} }
...@@ -23,10 +23,10 @@ export class AceComponent implements AfterViewInit { ...@@ -23,10 +23,10 @@ export class AceComponent implements AfterViewInit {
ngAfterViewInit() { ngAfterViewInit() {
this.editor.setTheme('dracula'); this.editor.setTheme('dracula');
/*
this.editor.getEditor().setOptions({ this.editor.getEditor().setOptions({
enableBasicAutocompletion: true
}); });*/
/* /*
this.editor.getEditor().commands.addCommand({ this.editor.getEditor().commands.addCommand({
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="server_rest_new" />
<module name="09" /> <module name="09" />
<module name="server_rest_new" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
</component> </component>
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment=""> <list default="true" id="e6a1f2e5-4f60-4227-82bb-83eb10fa94a5" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../serveur_compilation/.idea/uiDesigner.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" afterDir="false" /> <change afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/HostCompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/app.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/app.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../serveur_compilation/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../serveur_compilation/docker/dockerfile" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/share_docker_file/Main.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../serveur_compilation/share_docker_file/test.txt" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/share_docker_file/kata.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../serveur_compilation/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/compilation.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/app.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../serveur_compilation/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/src/main/java/DockerCompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../serveur_compilation/target/classes/compilation.class" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/target/classes/compilation.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../serveur_compilation/target/classes/compilation.class" beforeDir="false" afterPath="$PROJECT_DIR$/../serveur_compilation/target/classes/compilation.class" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
...@@ -30,20 +30,23 @@ ...@@ -30,20 +30,23 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
<caret line="20" column="12" lean-forward="true" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="387">
<caret line="33" selection-start-line="33" selection-end-line="33" /> <caret line="32" column="112" lean-forward="true" selection-start-line="32" selection-start-column="112" selection-end-line="32" selection-end-column="112" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -75,11 +78,10 @@ ...@@ -75,11 +78,10 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6" fullScreen="true"> <component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="180" /> <option name="y" value="23" />
<option name="y" value="112" /> <option name="width" value="1920" />
<option name="width" value="1080" /> <option name="height" value="1121" />
<option name="height" value="676" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="1" id="Add" /> <ConfirmationsSetting value="1" id="Add" />
...@@ -105,6 +107,7 @@ ...@@ -105,6 +107,7 @@
<property name="node.js.selected.package.eslint" value="(autodetect)" /> <property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="restartRequiresConfirmation" value="false" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
...@@ -166,14 +169,16 @@ ...@@ -166,14 +169,16 @@
<workItem from="1556827416534" duration="171000" /> <workItem from="1556827416534" duration="171000" />
<workItem from="1556827744217" duration="333000" /> <workItem from="1556827744217" duration="333000" />
<workItem from="1556829690737" duration="985000" /> <workItem from="1556829690737" duration="985000" />
<workItem from="1556864771569" duration="1439000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7523000" /> <option name="totallyTimeSpent" value="8962000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="6" /> <frame x="0" y="23" width="1920" height="1121" extended-state="1" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.2603834" /> <window_info content_ui="combo" id="Project" order="0" weight="0.2603834" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -184,7 +189,7 @@ ...@@ -184,7 +189,7 @@
<window_info id="Favorites" order="6" side_tool="true" /> <window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3" /> <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.2993197" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
...@@ -192,9 +197,9 @@ ...@@ -192,9 +197,9 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32891566" /> <window_info anchor="bottom" id="Terminal" order="10" weight="0.3283186" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" /> <window_info anchor="bottom" id="Messages" order="12" weight="0.32944608" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -213,14 +218,17 @@ ...@@ -213,14 +218,17 @@
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
<caret line="20" column="12" lean-forward="true" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" /> <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="387">
<caret line="33" selection-start-line="33" selection-end-line="33" /> <caret line="32" column="112" lean-forward="true" selection-start-line="32" selection-start-column="112" selection-end-line="32" selection-end-column="112" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
import io.javalin.Javalin; import io.javalin.Javalin;
import java.io.*; import java.io.*;
import java.net.ConnectException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
...@@ -13,24 +14,38 @@ public class app { ...@@ -13,24 +14,38 @@ public class app {
app.get("/run/", ctx -> { app.get("/run/", ctx -> {
HttpURLConnection connection = null;
try{
URL compilator = new URL("http://localhost:6999"); URL compilator = new URL("http://localhost:6999");
HttpURLConnection connection = (HttpURLConnection) compilator.openConnection(); connection = (HttpURLConnection) compilator.openConnection();
connection.setRequestMethod("POST"); connection.setRequestMethod("POST");
connection.setDoOutput(true); connection.setDoOutput(true);
}catch (ConnectException e){
e.printStackTrace();
}
//Send request //Send request
DataOutputStream wr = new DataOutputStream (connection.getOutputStream());
String type = StringEscapeUtils.escapeJava(ctx.queryParams("language").get(0)); String type = StringEscapeUtils.escapeJava(ctx.queryParams("language").get(0));
String code = StringEscapeUtils.escapeJava(ctx.queryParams("code").get(0)); String code = StringEscapeUtils.escapeJava(ctx.queryParams("code").get(0));
String vassert = StringEscapeUtils.escapeJava(ctx.queryParams("test").get(0)); String vassert = StringEscapeUtils.escapeJava(ctx.queryParams("test").get(0));
try(DataOutputStream wr = new DataOutputStream (connection.getOutputStream())){
wr.writeBytes("{\"language\":\""+type+"\",\"stream\":\""+code+"\",\"assert\":\""+vassert+"\"}"); wr.writeBytes("{\"language\":\""+type+"\",\"stream\":\""+code+"\",\"assert\":\""+vassert+"\"}");
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}catch (ConnectException e){
e.printStackTrace();
}
wr.close(); try(BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))){
String response = in.readLine();
ctx.result(response);
} catch(IOException e){
e.printStackTrace();
}
BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
//String inputLine; //String inputLine;
//while ((inputLine = in.readLine()) != null) //while ((inputLine = in.readLine()) != null)
...@@ -38,10 +53,10 @@ public class app { ...@@ -38,10 +53,10 @@ public class app {
// For now, we can assume we will only need to fetch one response since the compilation // For now, we can assume we will only need to fetch one response since the compilation
// server does send one json object with all the required data. // server does send one json object with all the required data.
String response = in.readLine();
ctx.result(response);
in.close();
}); });
} }
......
No preview for this file type
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment=""> <list default="true" id="8d8fb2c1-8426-4933-8193-ee68625cf8de" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.html" afterDir="false" /> <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package-lock.json" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/java/HostCompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/package.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace-assert/ace-assert.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.component.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/ace/ace.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/app.module.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../server_rest/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../front-end-compilation/src/app/compilateur/compilateur.component.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../server_rest/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/src/main/java/app.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../server_rest/target/classes/app.class" beforeDir="false" afterPath="$PROJECT_DIR$/../server_rest/target/classes/app.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docker/dockerfile" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/share_docker_file/Main.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/share_docker_file/test.txt" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/share_docker_file/kata.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/compilation.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/app.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/app.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/compilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/DockerCompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/compilation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/compilation.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/compilation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/compilation.class" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/compilation.java"> <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="225">
<caret line="21" column="179" selection-start-line="21" selection-start-column="179" selection-end-line="21" selection-end-column="287" /> <caret line="15" column="53" lean-forward="true" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -54,14 +54,30 @@ ...@@ -54,14 +54,30 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="105">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" /> <caret line="8" column="19" lean-forward="true" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/HostCompilation.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="28" selection-start-column="28" selection-end-column="28" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
</component> </component>
...@@ -71,6 +87,7 @@ ...@@ -71,6 +87,7 @@
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/share_docker_file/Main.java" /> <option value="$PROJECT_DIR$/share_docker_file/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/compilation.java" /> <option value="$PROJECT_DIR$/src/main/java/compilation.java" />
<option value="$PROJECT_DIR$/src/main/java/Docker_compilation.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -82,10 +99,9 @@ ...@@ -82,10 +99,9 @@
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" fullScreen="true"> <component name="ProjectFrameBounds" fullScreen="true">
<option name="x" value="180" /> <option name="x" value="1920" />
<option name="y" value="112" /> <option name="width" value="1920" />
<option name="width" value="1080" /> <option name="height" value="1200" />
<option name="height" value="676" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
...@@ -93,8 +109,6 @@ ...@@ -93,8 +109,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -107,15 +121,41 @@ ...@@ -107,15 +121,41 @@
<item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
<item name="docker" type="462c0819:PsiDirectoryNode" /> <item name="docker" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" />
<item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
<item name="docker" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" /> <item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" />
<item name="serveur_compilation" type="462c0819:PsiDirectoryNode" /> <item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
<item name="share_docker_file" type="462c0819:PsiDirectoryNode" /> <item name="share_docker_file" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" />
<item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" />
<item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="serveur_compilation" type="b2602c69:ProjectViewProjectNode" />
<item name="serveur_compilation" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -193,11 +233,12 @@ ...@@ -193,11 +233,12 @@
<workItem from="1556827413018" duration="173000" /> <workItem from="1556827413018" duration="173000" />
<workItem from="1556827741611" duration="619000" /> <workItem from="1556827741611" duration="619000" />
<workItem from="1556829689470" duration="1450000" /> <workItem from="1556829689470" duration="1450000" />
<workItem from="1556864756289" duration="5129000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9235000" /> <option name="totallyTimeSpent" value="14364000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -209,10 +250,10 @@ ...@@ -209,10 +250,10 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="1920" y="0" width="1920" height="1200" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26824033" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27103302" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
...@@ -221,8 +262,8 @@ ...@@ -221,8 +262,8 @@
<window_info id="Favorites" order="6" side_tool="true" /> <window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32891566" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32891566" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32891566" /> <window_info anchor="bottom" id="Run" order="2" weight="0.3283186" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32891566" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32891566" />
...@@ -246,20 +287,9 @@ ...@@ -246,20 +287,9 @@
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/compilation.java</url>
<line>47</line>
<properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/share_docker_file/test.txt" /> <entry file="file://$PROJECT_DIR$/share_docker_file/test.txt" />
<entry file="file://$PROJECT_DIR$/share_docker_file/Main.java" />
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705"> <state relative-caret-position="705">
...@@ -267,24 +297,24 @@ ...@@ -267,24 +297,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/app.java"> <entry file="file://$PROJECT_DIR$/src/main/java/HostCompilation.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state>
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" /> <caret column="28" selection-start-column="28" selection-end-column="28" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/share_docker_file/Main.java"> <entry file="file://$PROJECT_DIR$/src/main/java/app.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="105">
<caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" /> <caret line="8" column="19" lean-forward="true" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/compilation.java"> <entry file="file://$PROJECT_DIR$/src/main/java/DockerCompilation.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="225">
<caret line="21" column="179" selection-start-line="21" selection-start-column="179" selection-end-line="21" selection-end-column="287" /> <caret line="15" column="53" lean-forward="true" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
File deleted
File deleted
...@@ -3,7 +3,7 @@ import org.json.JSONObject; ...@@ -3,7 +3,7 @@ import org.json.JSONObject;
import java.io.*; import java.io.*;
import java.util.HashMap; import java.util.HashMap;
public class compilation { public class DockerCompilation {
public HashMap<String, Object> execute_kata(JSONObject input) { public HashMap<String, Object> execute_kata(JSONObject input) {
...@@ -93,9 +93,9 @@ public class compilation { ...@@ -93,9 +93,9 @@ public class compilation {
switch (input.get("language").toString()){ switch (input.get("language").toString()){
case "java": case "java":
file = new File("Main.class"); file = new File("share_docker_file/Main.class");
file.delete(); file.delete();
file = new File("kata.class"); file = new File("share_docker_file/kata.class");
file.delete(); file.delete();
break; break;
} }
......
public class HostCompilation {
}
...@@ -7,7 +7,7 @@ public class app { ...@@ -7,7 +7,7 @@ public class app {
Javalin app = Javalin.create().enableCorsForAllOrigins().start(6999); Javalin app = Javalin.create().enableCorsForAllOrigins().start(6999);
app.post("/", ctx -> { app.post("/", ctx -> {
compilation cpl = new compilation(); DockerCompilation cpl = new DockerCompilation();
ctx.json(cpl.execute_kata(new JSONObject(ctx.body()))); ctx.json(cpl.execute_kata(new JSONObject(ctx.body())));
}); });
} }
......
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment