Skip to content

Commit 5b30ef6

Browse files
tomeqtomeq
tomeq
authored and
tomeq
committed
Merge branch 'Develop'
2 parents f0077a9 + 40aacd3 commit 5b30ef6

File tree

12 files changed

+126
-97
lines changed

12 files changed

+126
-97
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.settings/
44
target/
55

6+
.idea
67
.project
78
.classpath
89
.springBeans

‎src/Grown-mainContext.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,17 @@
2929

3030
<bean id="mainController" class="com.Polodz.controller.MainController">
3131
<property name="membersDAO" ref="MembersDAOF" />
32-
<property name="telentController" ref="IController" />
32+
<property name="telnetController" ref="IController" />
3333
</bean>
3434

3535

3636
<context:component-scan base-package="com.Polodz.Controller" />
3737
<context:component-scan base-package="com.Polodz.View" />
3838

39+
40+
<context:component-scan base-package="com.Polodz.service" />
41+
<!-- <context:component-scan base-package="com.Polodz.webController" /> -->
42+
3943

4044

4145

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,12 @@ public void keyPressed(KeyEvent e) {
173173
btnNewButton_3 = new JButton("Audit");
174174
btnNewButton_3.addActionListener(new ActionListener() {
175175
public void actionPerformed(ActionEvent e) {
176-
177-
setCentralText(mainController.getAuditRaport());
178-
176+
Thread t1 = new Thread(new Runnable() {
177+
public void run()
178+
{
179+
setCentralText(mainController.getAuditRaport());
180+
}});
181+
t1.start();
179182
}
180183
});
181184
getContentPane().add(btnNewButton_3, "cell 3 1");

‎src/main/java/com/Polodz/WebController/MainPageController.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.Polodz.WebController;
2+
3+
import org.springframework.stereotype.Controller;
4+
import org.springframework.web.bind.annotation.GetMapping;
5+
import org.springframework.web.servlet.ModelAndView;
6+
7+
/**
8+
* Created by Łukasz on 07.09.2016.
9+
*/
10+
11+
@Controller
12+
public class MainPageController {
13+
14+
@GetMapping("/")
15+
public ModelAndView getMainPage() {
16+
return new ModelAndView("mainPage");
17+
}
18+
}

‎src/main/java/com/Polodz/WebController/MovieListController.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.Polodz.WebController;
2+
3+
import com.Polodz.service.WebService;
4+
import org.springframework.beans.factory.annotation.Autowired;
5+
import org.springframework.stereotype.Controller;
6+
import org.springframework.ui.Model;
7+
import org.springframework.web.bind.annotation.GetMapping;
8+
import org.springframework.web.servlet.ModelAndView;
9+
10+
/**
11+
* Created by lpolatowski on 2016-09-07.
12+
*/
13+
14+
@Controller
15+
public class MovieListController {
16+
17+
@Autowired
18+
private WebService service;
19+
20+
@GetMapping("/movieList")
21+
public ModelAndView getMovieList() {
22+
return new ModelAndView("movieList").addObject("string", service.getMovieListString());
23+
}
24+
25+
}

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

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,35 @@
11
package com.Polodz.controller;
22

33
import java.util.Arrays;
4-
import java.util.Iterator;
54
import java.util.List;
65

7-
import javax.annotation.Resource;
8-
96
import org.apache.log4j.Logger;
107
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.beans.factory.annotation.Qualifier;
128
import org.springframework.context.annotation.Bean;
13-
import org.springframework.context.annotation.ComponentScan;
149
import org.springframework.context.annotation.Configuration;
15-
import org.springframework.context.annotation.Primary;
16-
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;
2110

2211
import com.Polodz.View.MainWindow;
23-
import com.Polodz.model.MembersFactory;
24-
import com.Polodz.model.StringWebData;
2512
import com.Polodz.model.Config;
2613
import com.Polodz.model.IItem;
2714
import com.Polodz.model.IMember;
2815
import com.Polodz.model.MembersDAO;
29-
import com.Polodz.service.TelnetConnector;
16+
import com.Polodz.service.WebService;
3017

3118
@Configuration
3219
@org.springframework.stereotype.Controller
3320
//@Service("mainControlerService")!!!!
3421
//@ComponentScan("com.Polodz.model")
3522
public class MainController implements IMainController {
3623
private static final Logger log = Logger.getLogger(MainController.class.getName());
37-
public void test() {
38-
log.info("test");
39-
}
24+
4025
@Autowired
4126
private MembersDAO membersDAO;
4227

4328
@Autowired
44-
private IController telentController;
29+
private IController telnetController;
4530

4631
@Autowired
47-
private WebMovieListController webDataHandler;
32+
private WebService webDataHandler;
4833

4934
@Autowired
5035
private MainWindow mainView;
@@ -61,19 +46,18 @@ public void setMembersDAO(MembersDAO membersDAO) {
6146
this.membersDAO = membersDAO;
6247
}
6348

64-
public IController getTelentController() {
65-
return telentController;
49+
public IController getTelnetController() {
50+
return this.telnetController;
6651
}
6752

68-
public void setTelentController(IController telentController) {
69-
this.telentController = telentController;
70-
//log.info(getMtcResponse("list"));
53+
public void setTelnetController(IController telentController) {
54+
this.telnetController = telentController;
7155
}
7256

73-
@Bean
57+
/*@Bean
7458
public WebMovieListController getWebMovieListController() {
7559
return new WebMovieListController();
76-
}
60+
}*/
7761

7862
@Bean
7963
public MainWindow getView() {
@@ -83,47 +67,37 @@ public MainWindow getView() {
8367
membersDAO.getMembersAudience()./*parallelStream().*/forEach(
8468
cur->{
8569
String currentName=cur.getName();
86-
String webStringBuffor=null;
70+
String webStringBuffor="";
71+
log.info(currentName);
8772
int currentIndex=mainView.addToTree(currentName);
8873
if (cur.getItems()!=null)
89-
cur.getItems()/*.parallelStream()*/.forEach(
90-
current->{
91-
mainView.addToSelectedSubTree(current.getName()
92-
,currentIndex);
93-
// if(currentName == "Main_Store") {
94-
// webStringBuffor+=current.getName()+"\n";
95-
// }
96-
});
97-
98-
//if (webStringBuffor!=null) {
99-
// this.setRentWebItems(webStringBuffor);
100-
//}
74+
for (IItem current : cur.getItems()) {
75+
mainView.addToSelectedSubTree(current.getName()
76+
,currentIndex);
77+
//if(currentName == "Main_Store") {
78+
webStringBuffor+=current.getName()+"\n";
79+
//}
80+
}
81+
if (webStringBuffor!=null) {
82+
this.setRentWebItems(webStringBuffor);
83+
}
10184
}
10285
);
10386
}
10487
log.info(membersDAO.getALL().length);
10588
return this.mainView;
10689
}
10790

108-
// @RequestMapping(method = RequestMethod.GET)
109-
// private ModelAndView Stringgg(String string) {
110-
// return new ModelAndView().addObject("testString", string);
111-
//
112-
// }
113-
//
11491
public void setRentWebItems(String input) {
115-
StringWebData stringWebData = new StringWebData();
116-
stringWebData.setContent("tes");
117-
// this.webDataHandler.stringForm((Model) Stringgg("tes"));
118-
this.webDataHandler.stringSubmit(stringWebData);
119-
}
92+
webDataHandler.setMovieListString(input);
93+
}
12094

12195
public String getServerResponse(String input) {
122-
return telentController.execute(input);
96+
return this.telnetController.execute(input);
12397
}
12498

12599
public String getLastServerResponse() {
126-
return ((Controller) telentController).getLastListing();
100+
return ((Controller) this.telnetController).getLastListing();
127101
}
128102
public List<IMember> listAll() {
129103
return Arrays.asList(membersDAO.getALL());
@@ -135,6 +109,13 @@ public void deleteMembersProduct(Long memberId,Integer index) {
135109
IMember delatingItemsMember = this.membersDAO.getMembersAudience().get(memberId.intValue());
136110
this.getServerResponse(delatingItemsMember.getName()+ "delete");
137111
delatingItemsMember.getItems().remove((int)index);
112+
StringBuilder b = new StringBuilder();
113+
// b.append("\n");
114+
// this.membersDAO.getALL()[getMembersAudience().size()]
115+
// .getItems().stream().forEach(b::append);
116+
//
117+
// this.membersDAO.getALL()[membersDAO.getMembersAudience().size()].getItems().stream().
118+
// map (i -> i.getName()).collect (Collectors.joining ("\n"));
138119
}
139120

140121
@Override
@@ -161,7 +142,7 @@ public String getAuditRaport() {
161142
try {
162143
raport.addToAudience(Integer.valueOf(this.getServerResponse(current.getId().toString())));
163144
} catch (Exception e) {
164-
raport.addToErrorBuffor(current.getName()+" movie for id "+current.getId().toString()+ "\n");
145+
raport.addToErrorBuffor(current.getName()+"movie for id "+current.getId().toString()+ "\n");
165146
}
166147
});
167148

‎src/main/java/com/Polodz/controller/WebMovieListController.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/main/java/com/Polodz/service/WebService.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.Polodz.service;
2+
3+
import org.springframework.stereotype.Service;
4+
5+
/**
6+
* Created by lpolatowski on 2016-09-07.
7+
*/
8+
@Service
9+
public class WebService {
10+
11+
private static String movieListString;
12+
13+
public String getMovieListString() {
14+
return movieListString;
15+
}
16+
17+
public static void setMovieListString(String value) {
18+
movieListString = value;
19+
}
20+
21+
}

‎src/main/resources/templates/mainPage.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!DOCTYPE html>
2+
<html xmlns:th="http://www.thymeleaf.org">
3+
<head>
4+
<title>Main Page</title>
5+
</head>
6+
<body>
7+
<a th:href="@{/movieList}">Movie List</a>
8+
</body>
9+
</html>

‎src/main/resources/templates/stringSubmit.html renamed to ‎src/main/resources/templates/movieList.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE HTML>
22
<html xmlns:th="http://www.thymeleaf.org">
33
<head>
4-
<title>Getting Started: Handling Form Submission</title>
5-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
4+
<title>Movie List</title>
5+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
66
</head>
77
<body>
8-
<p th:text="${stringgg.content}" />
8+
<p th:text="${string}"></p>
99
</body>
1010
</html>

0 commit comments

Comments
 (0)