Skip to content

Commit

Permalink
Merge pull request #137 from AnuragVanam/master
Browse files Browse the repository at this point in the history
Update on Issue#130
  • Loading branch information
ZihengSun authored Mar 26, 2021
2 parents e6e1c82 + 693800e commit 4909c4b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 17 deletions.
48 changes: 31 additions & 17 deletions src/main/java/com/gw/GeoweaverApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;

import java.awt.*;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;

@SpringBootApplication
@ServletComponentScan
public class GeoweaverApplication {
Expand All @@ -13,22 +18,31 @@ public static void main(String[] args) {
// BasicConfigurator.configure();

SpringApplication.run(GeoweaverApplication.class, args);

}

// @Bean
// public ServletContextAware endpointExporterInitializer(final ApplicationContext applicationContext) {
//
// return new ServletContextAware() {
//
// @Override
// public void setServletContext(ServletContext servletContext) {
// ServerEndpointExporter exporter = new ServerEndpointExporter();
// exporter.setApplicationContext(applicationContext);
// exporter.afterPropertiesSet();
// }
//
// };
// }
browse("http://localhost:8070/Geoweaver/");
// openHomePage();



}
public static void browse(String url) {
if(Desktop.isDesktopSupported()){
Desktop desktop = Desktop.getDesktop();
try {
desktop.browse(new URI(url));
} catch (IOException | URISyntaxException e) {
e.printStackTrace();
}
}else{
Runtime runtime = Runtime.getRuntime();
try {
runtime.exec("rundll32 url.dll,FileProtocolHandler " + url);
} catch (IOException e) {
e.printStackTrace();
}
}
}


}


11 changes: 11 additions & 0 deletions src/main/resources/static/js/gw.process.js
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,15 @@ GW.process = {
var instanceid = GW.workspace.theGraph.addProcess(one.id, one.name);

},

expand: function(folder){

console.log("EXPAND Process type")

$("#process_folder_"+folder+"_target").collapse("show");
// $("#"+GW.menu.getPanelIdByType("process")).collapse("show");

},

list: function(msg){

Expand Down Expand Up @@ -1513,6 +1522,8 @@ GW.process = {
msg.desc = req.desc;

GW.process.addMenuItem(msg, req.desc);

GW.process.expand(req.desc);

if(run)

Expand Down
9 changes: 9 additions & 0 deletions src/main/resources/static/js/gw.workflow.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ GW.workflow = {
GW.workflow.addMenuItem(msg);

console.log("the workflow is added");

GW.workflow.expand(msg);

GW.workflow.loaded_workflow = msg.id;

Expand Down Expand Up @@ -1423,6 +1425,13 @@ GW.workflow = {
"</li>");

},
expand: function(one){

console.log("EXPAND Workflow")

$("#"+GW.menu.getPanelIdByType("workflow")).collapse("show");
},


list: function(msg){

Expand Down

0 comments on commit 4909c4b

Please sign in to comment.