Skip to content

Commit e5c59d4

Browse files
tomeqtomeq
authored andcommitted
change structure
1 parent 57faccf commit e5c59d4

File tree

11 files changed

+127
-11
lines changed

11 files changed

+127
-11
lines changed

pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<artifactId>spring-boot-devtools</artifactId>
3030
</dependency>
3131
<!-- - -->
32+
<dependency>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-starter-thymeleaf</artifactId>
35+
</dependency>
3236
<dependency>
3337
<groupId>org.springframework.boot</groupId>
3438
<artifactId>spring-boot-starter-web</artifactId>
@@ -63,6 +67,11 @@
6367
<version>1.9.5</version>
6468
</dependency>
6569

70+
<dependency>
71+
<groupId>org.scala-lang</groupId>
72+
<artifactId>scala-library</artifactId>
73+
<version>2.11.0</version>
74+
</dependency>
6675
</dependencies>
6776

6877
<build>

src.zip

22.8 KB
Binary file not shown.

src/main/java/com/Polodz/GrownApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static void main(String[] args) {
2727
//Banner.Mode bannerMode= new Banner.Mode(OFF);
2828
new SpringApplicationBuilder(GrownApplication.class)
2929
.headless(false)
30-
.web(false)
30+
.web(true)
3131
//.bannerMode(Banner.Mode.OFF)
3232
.run(args);
3333
}

src/main/java/com/Polodz/Runner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void run(String... args) throws Exception {
3333

3434
@Override
3535
public void run() {
36-
controllerToView.frame().setVisible(true);
36+
controllerToView.getView().setVisible(true);
3737
}
3838
});
3939
}

src/main/java/com/Polodz/View/MainWindow.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import javax.swing.JTextPane;
1414
import java.awt.SystemColor;
1515
import net.miginfocom.swing.MigLayout;
16+
import scala.annotation.meta.setter;
1617

1718
import java.awt.event.KeyAdapter;
1819
import java.awt.event.KeyEvent;
@@ -54,6 +55,7 @@ public MainWindow(IMainController mainController) {
5455
this.mainController = mainController;
5556
setNimbus();
5657
initComponents();
58+
//mainController.setRentWebItems("Tst");
5759
this.setCentralText(((MainController) mainController).getLastServerResponse() + "\n");
5860
}
5961

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package com.Polodz.controller;
22

3+
import com.Polodz.View.MainWindow;
4+
35
public interface IMainController {
46

7+
public MainWindow getView();
8+
public void setRentWebItems(String input);
59
void deleteMembersProduct(Long memberId,Integer index);
610

711
}

src/main/java/com/Polodz/controller/MainController.java

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@
1414
import org.springframework.context.annotation.Configuration;
1515
import org.springframework.context.annotation.Primary;
1616
import org.springframework.stereotype.Service;
17+
import org.springframework.ui.Model;
18+
import org.springframework.web.bind.annotation.RequestMapping;
19+
import org.springframework.web.bind.annotation.RequestMethod;
20+
import org.springframework.web.servlet.ModelAndView;
1721

1822
import com.Polodz.View.MainWindow;
1923
import com.Polodz.model.MembersFactory;
24+
import com.Polodz.model.StringWebData;
2025
import com.Polodz.model.IMember;
2126
import com.Polodz.model.MembersDAO;
2227
import com.Polodz.service.TelnetConnector;
@@ -36,10 +41,15 @@ public void test() {
3641
@Autowired
3742
public IController telentController;
3843

44+
@Autowired
45+
public WebMovieListController webDataHandler;
46+
3947
@Autowired
4048
public MainWindow mainView;
49+
4150

4251
public MainController() {
52+
//this.setRentWebItems("test");
4353
}
4454

4555
public MembersDAO getMembersDAO() {
@@ -57,10 +67,10 @@ public void setTelentController(IController telentController) {
5767
this.telentController = telentController;
5868
//log.info(getMtcResponse("list"));
5969
}
60-
//@Bean
61-
public MainWindow frame() {
62-
log.info(membersDAO.getALL().length);
63-
return this.mainView;
70+
71+
@Bean
72+
public WebMovieListController getWebMovieListController() {
73+
return new WebMovieListController();
6474
}
6575

6676
@Bean
@@ -70,19 +80,42 @@ public MainWindow getView() {
7080
if (membersDAO.getMembersAudience()!=null)
7181
membersDAO.getMembersAudience()./*parallelStream().*/forEach(
7282
cur->{
73-
int currentIndex=mainView.addToTree(cur.getName());
83+
String currentName=cur.getName();
84+
String webStringBuffor=null;
85+
int currentIndex=mainView.addToTree(currentName);
7486
if (cur.getItems()!=null)
7587
cur.getItems()/*.parallelStream()*/.forEach(
76-
current->mainView
77-
.addToSelectedSubTree(current.getName()
78-
,currentIndex)
79-
);
88+
current->{
89+
mainView.addToSelectedSubTree(current.getName()
90+
,currentIndex);
91+
// if(currentName == "Main_Store") {
92+
// webStringBuffor+=current.getName()+"\n";
93+
// }
94+
});
95+
96+
//if (webStringBuffor!=null) {
97+
// this.setRentWebItems(webStringBuffor);
98+
//}
8099
}
81100
);
82101
}
83102
log.info(membersDAO.getALL().length);
84103
return this.mainView;
85104
}
105+
106+
// @RequestMapping(method = RequestMethod.GET)
107+
// private ModelAndView Stringgg(String string) {
108+
// return new ModelAndView().addObject("testString", string);
109+
//
110+
// }
111+
//
112+
public void setRentWebItems(String input) {
113+
StringWebData stringWebData = new StringWebData();
114+
stringWebData.setContent("tes");
115+
// this.webDataHandler.stringForm((Model) Stringgg("tes"));
116+
this.webDataHandler.stringSubmit(stringWebData);
117+
}
118+
86119
public String getServerResponse(String input) {
87120
return telentController.execute(input);
88121
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.Polodz.controller;
2+
3+
import org.springframework.stereotype.Controller;
4+
import org.springframework.ui.Model;
5+
import org.springframework.web.bind.annotation.GetMapping;
6+
import org.springframework.web.bind.annotation.PostMapping;
7+
8+
import com.Polodz.model.StringWebData;
9+
10+
//@Controller
11+
public class WebMovieListController {
12+
13+
@GetMapping("/stringForm")
14+
public String stringForm(Model model) {
15+
model.addAttribute("stringgg", new StringWebData());
16+
return "stringForm";
17+
}
18+
19+
@PostMapping("/stringForm")
20+
public String stringSubmit(StringWebData stringgg) {
21+
return "stringSubmit";
22+
}
23+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.Polodz.model;
2+
3+
import java.io.Serializable;
4+
5+
@SuppressWarnings("serial")
6+
public class StringWebData implements Serializable {
7+
8+
/**
9+
*
10+
*/
11+
private static final long serialVersionUID = 5766409459648709226L;
12+
private String content;
13+
14+
public String getContent() {
15+
return content;
16+
}
17+
18+
public void setContent(String content) {
19+
this.content = content;
20+
}
21+
22+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!DOCTYPE HTML>
2+
<html xmlns:th="http://www.thymeleaf.org">
3+
<head>
4+
<title>Getting Started: Handling Form Submission</title>
5+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6+
</head>
7+
<body>
8+
<form action="#" th:action="@{/stringForm}" th:object="${stringgg}" method="post">
9+
<p><input type="text" th:field="*{content}" /></p>
10+
<p><input type="submit" value="Submit" /> <input type="reset" value="Reset" /></p>
11+
</form>
12+
</body>
13+
</html>

0 commit comments

Comments
 (0)