Changeset 1227 for trunk/src/org/expeditee/gui
- Timestamp:
- 01/31/19 16:34:06 (5 years ago)
- Location:
- trunk/src/org/expeditee/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/AttributeUtils.java
r1200 r1227 197 197 _FrameAttrib.put("BackgroundColor", Frame.class.getMethod("getBackgroundColor"), 198 198 Frame.class.getMethod("setBackgroundColor", pColor)); 199 _FrameAttrib.put("EncryptionLabel", Frame.class.getMethod("getEncryptionLabel"), 200 Frame.class.getMethod("setEncryptionLabel", pString)); 201 199 202 200 203 // aliases for attribute setting 201 _FrameAttrib.alias("fgc", "foregroundcolor"); 202 _FrameAttrib.alias("bgc", "backgroundcolor"); 203 _FrameAttrib.alias("p", "permission"); 204 _FrameAttrib.alias("fgc", "foregroundcolor"); 205 _FrameAttrib.alias("bgc", "backgroundcolor"); 206 _FrameAttrib.alias("p", "permission"); 207 _FrameAttrib.alias("enc", "encryptionlabel"); 204 208 205 209 -
trunk/src/org/expeditee/gui/Frame.java
r1217 r1227 163 163 private Collection<FrameObserver> _observers = new HashSet<FrameObserver>(); 164 164 165 private String _encryptionLabel; 166 165 167 /** Default constructor, nothing is set. */ 166 168 public Frame() … … 2622 2624 } 2623 2625 2624 public Collection<? extends Item> getInteractableItems() 2625 { 2626 public Collection<? extends Item> getInteractableItems() { 2626 2627 /* 2627 2628 * TODO: Cache the interactableItems list so we dont have to recreate it … … 2655 2656 return _interactableItems; 2656 2657 } 2658 2659 public String getEncryptionLabel() { 2660 return _encryptionLabel; 2661 } 2662 2663 public void setEncryptionLabel(String label) { 2664 _encryptionLabel = label; 2665 } 2657 2666 2658 2667 private static final class History { -
trunk/src/org/expeditee/gui/FrameIO.java
r1219 r1227 43 43 import org.expeditee.auth.Authenticator; 44 44 import org.expeditee.auth.EncryptedExpReader; 45 import org.expeditee.auth.Encrypted ProfileExpWriter;45 import org.expeditee.auth.EncryptedExpWriter; 46 46 import org.expeditee.auth.gui.MailBay; 47 47 import org.expeditee.io.Conversion; … … 92 92 STATISTICS_DIR = PARENT_FOLDER + "statistics" + File.separator; 93 93 LOGS_DIR = PARENT_FOLDER + "logs" + File.separator; 94 SHARED_BY_ME_FRAMESETS = PARENT_FOLDER + "framesets-shared-by-me" + File.separator; 95 SHARED_WITH_ME_FRAMESETS = PARENT_FOLDER + "framesets-shared-with-me" + File.separator; 94 96 } 95 97 … … 125 127 126 128 public static String STATISTICS_DIR; 129 130 public static String SHARED_BY_ME_FRAMESETS; 131 132 public static String SHARED_WITH_ME_FRAMESETS; 127 133 128 134 public static String LOGS_DIR; … … 475 481 if (fullPath.endsWith(ExpReader.EXTENTION)) { 476 482 if (EncryptedExpReader.isEncryptedExpediteeFile(fullPath)) { 477 final boolean isProfile = frameName.startsWith(UserSettings.UserName.get()); 478 reader = new EncryptedExpReader(frameName, isProfile); 483 //final boolean isProfile = frameName.startsWith(UserSettings.UserName.get()); 484 //reader = new EncryptedExpReader(frameName, isProfile); 485 reader = new EncryptedExpReader(frameName); 479 486 } else { 480 487 reader = new ExpReader(frameName); … … 1006 1013 // if its a new frame or an existing Exp frame... 1007 1014 if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) { 1008 //Frame currentFrame = DisplayController.getCurrentFrame();1009 1015 if (UserSettings.Authenticated.get() && 1010 toSave.getN ame().startsWith(UserSettings.UserName.get())&&1011 toSave.get Number() != Authenticator.PUBLIC_KEY_FRAME) {1012 writer = new Encrypted ProfileExpWriter();1016 toSave.getNumber() != Authenticator.PUBLIC_KEY_FRAME && 1017 toSave.getEncryptionLabel() != null) { 1018 writer = new EncryptedExpWriter(toSave.getEncryptionLabel()); 1013 1019 savedVersion = EncryptedExpReader.getVersion(fullPath); 1014 1020 } else {
Note:
See TracChangeset
for help on using the changeset viewer.