Skip to content

Commit c91ff25

Browse files
Łukasz PolatowskiŁukasz Polatowski
authored andcommitted
Poprawione nazewnictwo
1 parent 0db230b commit c91ff25

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

src/Grown-mainContext.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
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

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
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 com.Polodz.service.WebService;
107
import org.apache.log4j.Logger;
118
import org.springframework.beans.factory.annotation.Autowired;
12-
import org.springframework.beans.factory.annotation.Qualifier;
139
import org.springframework.context.annotation.Bean;
14-
import org.springframework.context.annotation.ComponentScan;
1510
import org.springframework.context.annotation.Configuration;
16-
import org.springframework.context.annotation.Primary;
17-
import org.springframework.stereotype.Service;
18-
import org.springframework.ui.Model;
19-
import org.springframework.web.bind.annotation.RequestMapping;
20-
import org.springframework.web.bind.annotation.RequestMethod;
21-
import org.springframework.web.servlet.ModelAndView;
2211

2312
import com.Polodz.View.MainWindow;
24-
import com.Polodz.model.MembersFactory;
25-
import com.Polodz.model.StringWebData;
2613
import com.Polodz.model.Config;
2714
import com.Polodz.model.IItem;
2815
import com.Polodz.model.IMember;
2916
import com.Polodz.model.MembersDAO;
30-
import com.Polodz.service.TelnetConnector;
3117

3218
@Configuration
3319
@org.springframework.stereotype.Controller
@@ -44,7 +30,7 @@ public void test() {
4430
private MembersDAO membersDAO;
4531

4632
@Autowired
47-
private IController telentController;
33+
private IController telnetController;
4834

4935
@Autowired
5036
private MainWindow mainView;
@@ -62,12 +48,12 @@ public void setMembersDAO(MembersDAO membersDAO) {
6248
this.membersDAO = membersDAO;
6349
}
6450

65-
public IController getTelentController() {
66-
return telentController;
51+
public IController getTelnetController() {
52+
return telnetController;
6753
}
6854

69-
public void setTelentController(IController telentController) {
70-
this.telentController = telentController;
55+
public void setTelnetController(IController telnetController) {
56+
this.telnetController = telnetController;
7157
//log.info(getMtcResponse("list"));
7258
}
7359

@@ -112,11 +98,11 @@ public void setRentWebItems(String input) {
11298
}
11399

114100
public String getServerResponse(String input) {
115-
return telentController.execute(input);
101+
return telnetController.execute(input);
116102
}
117103

118104
public String getLastServerResponse() {
119-
return ((Controller) telentController).getLastListing();
105+
return ((Controller) telnetController).getLastListing();
120106
}
121107

122108
public List<IMember> listAll() {

src/test/resources/Grown-mainContext.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

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

3636

0 commit comments

Comments
 (0)