Project

General

Profile

EnhancedBrowseConfig.patch

Sergey Ivanovskiy, 09/17/2019 03:54 PM

Download (3.19 KB)

View differences:

src/com/goldencode/p2j/ui/BrowseKey.java 2019-09-17 19:12:00 +0000
65 65
import java.io.*;
66 66
import java.util.*;
67 67

  
68
import com.fasterxml.jackson.annotation.JsonCreator;
69
import com.fasterxml.jackson.annotation.JsonInclude;
70

  
68 71
/**
69 72
 * Key that uniquely identifies browse in an application using combination of the parent external
70 73
 * procedure name, browse name and set of column keys. If the parent external procedure name is
71 74
 * <code>null</code> then this key references to all browses.
72 75
 */
76
@JsonInclude(JsonInclude.Include.NON_NULL)
73 77
public class BrowseKey
74 78
implements Serializable
75 79
{
......
113 117
    * @param ehColumnKeys
114 118
    *        Set of column keys.
115 119
    */
120
   @JsonCreator
116 121
   public BrowseKey(String ehKeyProcName,
117 122
                    String ehKeyBrowseName,
118 123
                    Set<String> ehColumnKeys)
src/com/goldencode/p2j/ui/EnhancedBrowseConfig.java 2019-09-17 19:44:15 +0000
67 67

  
68 68
package com.goldencode.p2j.ui;
69 69

  
70
import com.fasterxml.jackson.annotation.JsonGetter;
71
import com.fasterxml.jackson.annotation.JsonIgnore;
72
import com.fasterxml.jackson.annotation.JsonInclude;
73
import com.fasterxml.jackson.annotation.JsonProperty;
70 74
import com.goldencode.p2j.ui.client.*;
71 75
import com.goldencode.p2j.ui.client.gui.*;
76

  
72 77
import java.io.*;
73 78
import java.util.*;
74 79

  
......
82 87
 *    <li>width, order and visibility of columns.</li>
83 88
 * </ul>
84 89
 */
90
@JsonInclude(JsonInclude.Include.NON_NULL)
85 91
public class EnhancedBrowseConfig
86 92
implements Serializable
87 93
{
......
229 235
    *
230 236
    * @return the key which identifies the underlying browse.
231 237
    */
238
   @JsonIgnore
232 239
   public BrowseKey getKey()
233 240
   {
234 241
      return new BrowseKey(ehKeyProcName,
......
244 251
    *
245 252
    * @return the storage key of this configuration.
246 253
    */
254
   @JsonIgnore
247 255
   public EnhancedBrowseConfigStorageKey getStorageKey()
248 256
   {
249 257
      return new EnhancedBrowseConfigStorageKey(userName, getKey());
src/com/goldencode/p2j/ui/EnhancedBrowseConfigStorageKey.java 2019-09-17 19:06:11 +0000
63 63

  
64 64
import java.util.*;
65 65

  
66
import com.fasterxml.jackson.annotation.JsonCreator;
67
import com.fasterxml.jackson.annotation.JsonProperty;
68

  
66 69
/**
67 70
 * Enhanced browse configuration storage key. Extends {@link BrowseKey} with the
68 71
 * field containing a user name. Used for keying configurations loaded from the directory.
......
89 92
    * @param configKey
90 93
    *        Key that uniquely identifies browse in an application.
91 94
    */
92
   public EnhancedBrowseConfigStorageKey(String userName, BrowseKey configKey)
95
   @JsonCreator
96
   public EnhancedBrowseConfigStorageKey(@JsonProperty("userName")String userName, @JsonProperty("configKey")BrowseKey configKey)
93 97
   {
94 98
      this.userName = userName;
95 99
      this.configKey = configKey;