Skip to content

Commit 09f0ea9

Browse files
junichi11junichi11
committed
test
1 parent 6588587 commit 09f0ea9

File tree

2 files changed

+43
-57
lines changed

2 files changed

+43
-57
lines changed

‎php/php.editor/nbproject/project.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,6 @@
6969
<specification-version>1.24</specification-version>
7070
</run-dependency>
7171
</dependency>
72-
<dependency>
73-
<code-name-base>org.netbeans.libs.jackson</code-name-base>
74-
<build-prerequisite/>
75-
<compile-dependency/>
76-
<run-dependency>
77-
<release-version>2</release-version>
78-
<specification-version>2.26</specification-version>
79-
</run-dependency>
80-
</dependency>
8172
<dependency>
8273
<code-name-base>org.netbeans.libs.javacup</code-name-base>
8374
<build-prerequisite/>

‎php/php.editor/src/org/netbeans/modules/php/editor/model/impl/PropertyHookSignatureItem.java‎

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
*/
1919
package org.netbeans.modules.php.editor.model.impl;
2020

21-
import com.fasterxml.jackson.annotation.JsonIgnore;
22-
import com.fasterxml.jackson.annotation.JsonProperty;
23-
import com.fasterxml.jackson.core.JsonProcessingException;
24-
import com.fasterxml.jackson.core.type.TypeReference;
25-
import com.fasterxml.jackson.databind.ObjectMapper;
2621
import java.util.ArrayList;
2722
import java.util.Collection;
2823
import java.util.List;
@@ -57,21 +52,21 @@ public class PropertyHookSignatureItem {
5752
private static final Logger LOGGER = Logger.getLogger(PropertyHookSignatureItem.class.getName());
5853
private static final String EMPTY_ARRAY = "[]"; // NOI18N
5954

60-
@JsonProperty("name")
55+
// @JsonProperty("name")
6156
private String name;
62-
@JsonProperty("start")
57+
// @JsonProperty("start")
6358
private int start;
64-
@JsonProperty("end")
59+
// @JsonProperty("end")
6560
private int end;
66-
@JsonProperty("mod")
61+
// @JsonProperty("mod")
6762
private int mod;
68-
@JsonProperty("isRef")
63+
// @JsonProperty("isRef")
6964
private boolean isRef;
70-
@JsonProperty("isAttr")
65+
// @JsonProperty("isAttr")
7166
private boolean isAttr;
72-
@JsonProperty("hasBody")
67+
// @JsonProperty("hasBody")
7368
private boolean hasBody;
74-
@JsonProperty("paramSig")
69+
// @JsonProperty("paramSig")
7570
private String paramSig;
7671

7772
// need a default constructor for jackson
@@ -142,15 +137,15 @@ public static String getSignatureFromScopes(Collection<? extends PropertyHookSco
142137
List<PropertyHookSignatureItem> signatureItems = getSignatureItemsFromScopes(propertyHookScopes);
143138
String signature = EMPTY_ARRAY;
144139
if (!signatureItems.isEmpty()) {
145-
try {
146-
ObjectMapper mapper = new ObjectMapper();
147-
signature = mapper.writeValueAsString(signatureItems);
148-
} catch (JsonProcessingException ex) {
149-
LOGGER.log(Level.WARNING, "Cannot serialize: {0}, {1}", new Object[]{signatureItems, ex.getMessage()}); // NOI18N
150-
}
151-
if (LOGGER.isLoggable(Level.FINE)) {
152-
LOGGER.log(Level.FINE, "getSignatureFromScopes() took: {0} ms", (System.currentTimeMillis() - start)); // NOI18N
153-
}
140+
// try {
141+
// ObjectMapper mapper = new ObjectMapper();
142+
// signature = mapper.writeValueAsString(signatureItems);
143+
// } catch (JsonProcessingException ex) {
144+
// LOGGER.log(Level.WARNING, "Cannot serialize: {0}, {1}", new Object[]{signatureItems, ex.getMessage()}); // NOI18N
145+
// }
146+
// if (LOGGER.isLoggable(Level.FINE)) {
147+
// LOGGER.log(Level.FINE, "getSignatureFromScopes() took: {0} ms", (System.currentTimeMillis() - start)); // NOI18N
148+
// }
154149
}
155150
return signature;
156151
}
@@ -180,15 +175,15 @@ public static String getSignatureFromElements(Collection<? extends PropertyHookE
180175
List<PropertyHookSignatureItem> signatureItems = getSignatureItemsFromElements(propertyHookElements);
181176
String signature = EMPTY_ARRAY;
182177
if (!signatureItems.isEmpty()) {
183-
try {
184-
ObjectMapper mapper = new ObjectMapper();
185-
signature = mapper.writeValueAsString(signatureItems);
186-
} catch (JsonProcessingException ex) {
187-
LOGGER.log(Level.WARNING, "Cannot serialize: {0}, {1}", new Object[]{signatureItems, ex.getMessage()}); // NOI18N
188-
}
189-
if (LOGGER.isLoggable(Level.FINE)) {
190-
LOGGER.log(Level.FINE, "getSignatureFromElements() took: {0} ms", (System.currentTimeMillis() - start)); // NOI18N
191-
}
178+
// try {
179+
// ObjectMapper mapper = new ObjectMapper();
180+
// signature = mapper.writeValueAsString(signatureItems);
181+
// } catch (JsonProcessingException ex) {
182+
// LOGGER.log(Level.WARNING, "Cannot serialize: {0}, {1}", new Object[]{signatureItems, ex.getMessage()}); // NOI18N
183+
// }
184+
// if (LOGGER.isLoggable(Level.FINE)) {
185+
// LOGGER.log(Level.FINE, "getSignatureFromElements() took: {0} ms", (System.currentTimeMillis() - start)); // NOI18N
186+
// }
192187
}
193188
return signature;
194189
}
@@ -220,61 +215,61 @@ public static List<PropertyHookSignatureItem> fromSignature(final String signatu
220215

221216
final long start = (LOGGER.isLoggable(Level.FINE)) ? System.currentTimeMillis() : 0;
222217
List<PropertyHookSignatureItem> signatureItems = List.of();
223-
try {
224-
ObjectMapper mapper = new ObjectMapper();
225-
signatureItems = mapper.readValue(signature, new TypeReference<List<PropertyHookSignatureItem>>() {});
226-
} catch (JsonProcessingException ex) {
227-
LOGGER.log(Level.WARNING,
228-
"Cannot deserialize: {0}, {1} (please try to delete your cache directory because the signature may be changed.)", // NOI18N
229-
new Object[]{signature, ex.getMessage()});
230-
}
218+
// try {
219+
// ObjectMapper mapper = new ObjectMapper();
220+
// signatureItems = mapper.readValue(signature, new TypeReference<List<PropertyHookSignatureItem>>() {});
221+
// } catch (JsonProcessingException ex) {
222+
// LOGGER.log(Level.WARNING,
223+
// "Cannot deserialize: {0}, {1} (please try to delete your cache directory because the signature may be changed.)", // NOI18N
224+
// new Object[]{signature, ex.getMessage()});
225+
// }
231226
if (LOGGER.isLoggable(Level.FINE)) {
232227
LOGGER.log(Level.FINE, "fromSignature() took: {0} ms", (System.currentTimeMillis() - start)); // NOI18N
233228
}
234229
return signatureItems;
235230
}
236231

237-
@JsonIgnore
232+
// @JsonIgnore
238233
public String getName() {
239234
return name;
240235
}
241236

242-
@JsonIgnore
237+
// @JsonIgnore
243238
public OffsetRange getOffsetRange() {
244239
return new OffsetRange(start, end);
245240
}
246241

247-
@JsonIgnore
242+
// @JsonIgnore
248243
public int getStart() {
249244
return start;
250245
}
251246

252-
@JsonIgnore
247+
// @JsonIgnore
253248
public int getEnd() {
254249
return end;
255250
}
256251

257-
@JsonIgnore
252+
// @JsonIgnore
258253
public int getModifier() {
259254
return mod;
260255
}
261256

262-
@JsonIgnore
257+
// @JsonIgnore
263258
public boolean isAttributed() {
264259
return isAttr;
265260
}
266261

267-
@JsonIgnore
262+
// @JsonIgnore
268263
public boolean isReference() {
269264
return isRef;
270265
}
271266

272-
@JsonIgnore
267+
// @JsonIgnore
273268
public boolean hasBody() {
274269
return hasBody;
275270
}
276271

277-
@JsonIgnore
272+
// @JsonIgnore
278273
public String getParameterSignature() {
279274
return paramSig;
280275
}

0 commit comments

Comments
 (0)