@@ -71,51 +71,41 @@ protected void doUpgrade() throws Exception {
71
71
String name = resultSet .getString ("name" );
72
72
long layoutPrototypeId = resultSet .getLong ("layoutPrototypeId" );
73
73
74
- _updateLayoutPageTemplateEntry (
75
- layoutPageTemplateEntryId , companyId , name ,
76
- layoutPrototypeId , countPreparedStatement ,
77
- deletePreparedStatement , updatePreparedStatement );
78
- }
79
- }
80
- }
74
+ Company company = _companyLocalService .getCompany (companyId );
81
75
82
- private void _updateLayoutPageTemplateEntry (
83
- long layoutPageTemplateEntryId , long companyId , String name ,
84
- long layoutPrototypeId , PreparedStatement countPreparedStatement ,
85
- PreparedStatement deletePreparedStatement ,
86
- PreparedStatement updatePreparedStatement )
87
- throws Exception {
76
+ String newName = name ;
88
77
89
- Company company = _companyLocalService .getCompany (companyId );
78
+ for (int i = 1 ;; i ++) {
79
+ countPreparedStatement .setLong (1 , company .getGroupId ());
80
+ countPreparedStatement .setString (2 , newName );
90
81
91
- String newName = name ;
82
+ ResultSet countResultSet =
83
+ countPreparedStatement .executeQuery ();
92
84
93
- for (int i = 1 ;; i ++) {
94
- countPreparedStatement .setLong (1 , company .getGroupId ());
95
- countPreparedStatement .setString (2 , newName );
85
+ if (countResultSet .next () &&
86
+ (countResultSet .getInt (1 ) > 0 )) {
96
87
97
- ResultSet resultSet = countPreparedStatement .executeQuery ();
88
+ newName = name + i ;
89
+ }
90
+ else {
91
+ break ;
92
+ }
93
+ }
98
94
99
- if (resultSet .next () && (resultSet .getInt (1 ) > 0 )) {
100
- newName = name + i ;
101
- }
102
- else {
103
- break ;
104
- }
105
- }
106
-
107
- updatePreparedStatement .setLong (1 , company .getGroupId ());
108
- updatePreparedStatement .setString (2 , newName );
109
- updatePreparedStatement .setLong (3 , layoutPageTemplateEntryId );
95
+ updatePreparedStatement .setLong (1 , company .getGroupId ());
96
+ updatePreparedStatement .setString (2 , newName );
97
+ updatePreparedStatement .setLong (3 , layoutPageTemplateEntryId );
110
98
111
- updatePreparedStatement .executeUpdate ();
99
+ updatePreparedStatement .executeUpdate ();
112
100
113
- deletePreparedStatement .setLong (1 , company .getGroupId ());
114
- deletePreparedStatement .setInt (
115
- 2 , LayoutPageTemplateEntryTypeConstants .TYPE_WIDGET_PAGE );
116
- deletePreparedStatement .setLong (3 , layoutPrototypeId );
101
+ deletePreparedStatement .setLong (1 , company .getGroupId ());
102
+ deletePreparedStatement .setInt (
103
+ 2 , LayoutPageTemplateEntryTypeConstants .TYPE_WIDGET_PAGE );
104
+ deletePreparedStatement .setLong (3 , layoutPrototypeId );
117
105
118
- deletePreparedStatement .executeUpdate ();
106
+ deletePreparedStatement .executeUpdate ();
107
+ }
108
+ }
119
109
}
120
110
121
111
private final CompanyLocalService _companyLocalService ;
0 commit comments