Changeset 1505 for trunk/src/org/expeditee/gui/Frame.java
- Timestamp:
- 01/30/20 13:03:50 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/Frame.java
r1502 r1505 117 117 private PermissionTriple _permissionTriple = null; 118 118 119 private EncryptionPermissionTriple _encPermissionTriple = null; 119 private EncryptionPermissionTriple _frameEncryptionPermission = null; 120 121 private EncryptionPermissionTriple _itemEncryptionPermission = null; 120 122 121 123 private String _owner = null; … … 154 156 private ItemsList _primaryItemsBody = new ItemsList(); 155 157 private ItemsList _surrogateItemsBody = new ItemsList(); 156 157 //private List<Item> _body = new ArrayList<Item>();158 //private List<Item> _bodyHiddenDueToPermissions = new ArrayList<Item>();159 //private List<Item> _primaryItemsBody = new ArrayList<Item>();160 //private List<Item> _surrogateItemsBody = new ArrayList<Item>();161 158 162 159 // for drawing purposes … … 199 196 private String _encryptionLabel; 200 197 198 private String _homogeneousEncryptionLabel; 199 201 200 private String _groupFrameName; 202 201 private Frame _groupFrame = null; … … 217 216 218 217 public boolean isEncryptableFrame() { 219 boolean hasEncryptionLabel = this.get EncryptionLabel() != null;218 boolean hasEncryptionLabel = this.getFrameEncryptionLabel() != null; 220 219 boolean isProfileFrame = this.getPath().equals(FrameIO.PROFILE_PATH); 221 220 boolean isCredentialsFrame = isProfileFrame && this.getNumber() == AuthenticatorBrowser.CREDENTIALS_FRAME; … … 580 579 public Item getNameItem() { 581 580 //Text ret = _frameName; 582 if (this.get EncryptionLabel() != null && this.getEncryptionLabel().length() > 0) {581 if (this.getFrameEncryptionLabel() != null && this.getFrameEncryptionLabel().length() > 0) { 583 582 _frameName.setText("\uD83D\uDD12" + getFramesetName() + _number); 584 583 _frameName.resetFrameNamePosition(); … … 3001 3000 return _interactableItems; 3002 3001 } 3003 3004 public String getEncryptionLabel() { 3002 3003 /** Encryption related functions start **/ 3004 public String getFrameEncryptionLabel() { 3005 3005 return _encryptionLabel; 3006 3006 } 3007 3007 3008 public void set EncryptionLabel(String label) {3008 public void setFrameEncryptionLabel(String label) { 3009 3009 LabelInfo labelResult = Label.getLabel(label); 3010 3010 boolean isProfileOrNone = label.equals("Profile") || label.equals("None"); … … 3019 3019 } 3020 3020 3021 public EncryptionPermissionTriple getFrameEncryptionPermission() { 3022 return _frameEncryptionPermission; 3023 } 3024 3025 public void setFrameEncryptionPermission(EncryptionPermissionTriple p) { 3026 _frameEncryptionPermission = p; 3027 } 3028 3029 public String getHomogeneousEncryptionLabel() { 3030 return _homogeneousEncryptionLabel; 3031 } 3032 3033 public void setHomogeneousEncryptionLabel(String label) { 3034 LabelInfo labelResult = Label.getLabel(label); 3035 boolean isProfileOrNone = label.equals("Profile") || label.equals("None"); 3036 if (!isProfileOrNone && !labelResult.is(LabelResult.SuccessResolveLabelToKey)) { 3037 MessageBay.displayMessage(labelResult.toString()); 3038 this._homogeneousEncryptionLabel = null; 3039 return; 3040 } 3041 3042 this.setChanged(true); 3043 _homogeneousEncryptionLabel = label; 3044 } 3045 3021 3046 public EncryptionPermissionTriple getEncryptionPermission() { 3022 return _ encPermissionTriple;3047 return _itemEncryptionPermission; 3023 3048 } 3024 3049 3025 3050 public void setEncryptionPermission(EncryptionPermissionTriple p) { 3026 _encPermissionTriple = p; 3027 } 3051 _itemEncryptionPermission = p; 3052 } 3053 /** Encryption related functions end **/ 3028 3054 3029 3055 public String getGroup() {
Note:
See TracChangeset
for help on using the changeset viewer.