Changeset 7015
- Timestamp:
- Nov 17, 2015, 1:57:57 PM (7 years ago)
- Location:
- trunk/src/core
- Files:
-
- 60 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/core/common-queries.xml
r6996 r7015 1163 1163 SELECT count(*) 1164 1164 FROM MessageData msg 1165 WHERE msg.to = :user AND msg.read = false AND msg.removed = false1165 WHERE msg.to = :user AND msg.read = false AND msg.removedBy IS NULL 1166 1166 </sql> 1167 1167 <description> … … 1349 1349 WHERE job.status = :status 1350 1350 AND job.type = :type 1351 AND job.removed = false1351 AND job.removedBy IS NULL 1352 1352 ORDER BY job.priority ASC, job.scheduled ASC 1353 1353 </sql> … … 1366 1366 WHERE job.status = :status 1367 1367 AND job.type = :type 1368 AND job.removed = false1368 AND job.removedBy IS NULL 1369 1369 AND job.pluginDefinition.useInternalJobQueue = true 1370 1370 AND job.jobAgentId IS NULL … … 1384 1384 FROM JobData job 1385 1385 WHERE job.type = :type 1386 AND job.removed = false1386 AND job.removedBy IS NULL 1387 1387 AND NOT job.signalTransporter IS NULL 1388 1388 </sql> … … 2032 2032 SELECT trash 2033 2033 FROM net.sf.basedb.core.data.RemovableData trash 2034 WHERE trash.removed = true2034 WHERE NOT trash.removedBy IS NULL 2035 2035 </sql> 2036 2036 <description> -
trunk/src/core/net/sf/basedb/core/BioAssaySet.java
r7002 r7015 240 240 public boolean isRemoved() 241 241 { 242 return getData(). isRemoved();242 return getData().getRemovedBy() != null; 243 243 } 244 244 @Override … … 247 247 { 248 248 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 249 getData().setRemoved (removed);249 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 250 250 } 251 251 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/BioPlateEventType.java
r6874 r7015 192 192 public boolean isRemoved() 193 193 { 194 return getData(). isRemoved();194 return getData().getRemovedBy() != null; 195 195 } 196 196 @Override … … 199 199 { 200 200 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 201 getData().setRemoved (removed);201 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 202 202 } 203 203 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/BioPlateType.java
r6875 r7015 150 150 public boolean isRemoved() 151 151 { 152 return getData(). isRemoved();152 return getData().getRemovedBy() != null; 153 153 } 154 154 @Override … … 157 157 { 158 158 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 159 getData().setRemoved (removed);159 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 160 160 } 161 161 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/CommonItem.java
r6874 r7015 82 82 public boolean isRemoved() 83 83 { 84 return getData(). isRemoved();84 return getData().getRemovedBy() != null; 85 85 } 86 86 @Override … … 89 89 { 90 90 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 91 getData().setRemoved (removed);91 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 92 92 } 93 93 -
trunk/src/core/net/sf/basedb/core/DataFileType.java
r6881 r7015 402 402 public boolean isRemoved() 403 403 { 404 return getData(). isRemoved();404 return getData().getRemovedBy() != null; 405 405 } 406 406 @Override … … 409 409 { 410 410 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 411 getData().setRemoved (removed);411 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 412 412 } 413 413 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Directory.java
r6881 r7015 506 506 public boolean isRemoved() 507 507 { 508 return getData().isRemoved(); 509 } 510 508 return getData().getRemovedBy() != null; 509 } 511 510 @Override 512 511 public void setRemoved(boolean removed) … … 514 513 { 515 514 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 516 getData().setRemoved (removed);515 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 517 516 } 518 517 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/ExtraValueType.java
r6881 r7015 205 205 public boolean isRemoved() 206 206 { 207 return getData(). isRemoved();207 return getData().getRemovedBy() != null; 208 208 } 209 209 @Override … … 212 212 { 213 213 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 214 getData().setRemoved (removed);214 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 215 215 } 216 216 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/File.java
r6898 r7015 1821 1821 data.setCompressed(compress); 1822 1822 data.setLocation(Location.PRIMARY.getValue()); 1823 data.setRemoved (false);1823 data.setRemovedBy(null); 1824 1824 data.setUrl(null); 1825 1825 if (md5 != null) -
trunk/src/core/net/sf/basedb/core/Group.java
r6881 r7015 224 224 public boolean isRemoved() 225 225 { 226 return getData(). isRemoved();226 return getData().getRemovedBy() != null; 227 227 } 228 228 @Override … … 231 231 { 232 232 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 233 getData().setRemoved (removed);233 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 234 234 } 235 235 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/HibernateUtil.java
r6966 r7015 476 476 { 477 477 log.info("Adding 'isRemoved' filter to "+c.getName()); 478 defineFilter(classTag, itemType, "isRemoved", ":removed = `removed`", filterTemplate);478 defineFilter(classTag, itemType, "isRemoved", ":removed <> (`removed_by` IS NULL)", filterTemplate); 479 479 } 480 480 if (AnnotatableData.class.isAssignableFrom(c)) -
trunk/src/core/net/sf/basedb/core/Install.java
r6996 r7015 118 118 method. 119 119 */ 120 public static final int NEW_SCHEMA_VERSION = Integer.valueOf(1 28).intValue();120 public static final int NEW_SCHEMA_VERSION = Integer.valueOf(130).intValue(); 121 121 122 122 public static synchronized int createTables(SchemaGenerator.Mode mode, ProgressReporter progress, -
trunk/src/core/net/sf/basedb/core/InternalJobQueue.java
r6881 r7015 329 329 WHERE job.status = :status 330 330 AND job.type = :type 331 AND job.removed = false331 AND job.removedBy IS NULL 332 332 [AND job.pluginDefinition.useInternalJobQueue = true] 333 333 [AND job.jobAgentId IS NULL] … … 404 404 FROM JobData job 405 405 AND job.type = :type 406 AND job.removed = false406 AND job.removedBy IS NULL 407 407 AND NOT job.signalTransporter IS NULL 408 408 */ -
trunk/src/core/net/sf/basedb/core/ItemSubtype.java
r6898 r7015 316 316 public boolean isRemoved() 317 317 { 318 return getData(). isRemoved();318 return getData().getRemovedBy() != null; 319 319 } 320 320 @Override … … 323 323 { 324 324 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 325 getData().setRemoved (removed);325 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 326 326 } 327 327 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Message.java
r6874 r7015 146 146 SELECT count(*) 147 147 FROM MessageData msg 148 WHERE msg.to = :user AND msg.read = false AND msg.removed = false148 WHERE msg.to = :user AND msg.read = false AND msg.removedBy IS NULL 149 149 */ 150 150 query.setInteger("user", user == null ? dc.getSessionControl().getLoggedInUserId() : user.getId()); … … 242 242 public boolean isRemoved() 243 243 { 244 return getData(). isRemoved();244 return getData().getRemovedBy() != null; 245 245 } 246 246 @Override … … 249 249 { 250 250 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 251 getData().setRemoved (removed);251 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 252 252 } 253 253 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/MimeType.java
r6874 r7015 225 225 public boolean isRemoved() 226 226 { 227 return getData(). isRemoved();227 return getData().getRemovedBy() != null; 228 228 } 229 229 @Override … … 232 232 { 233 233 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 234 getData().setRemoved (removed);234 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 235 235 } 236 236 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/News.java
r6874 r7015 164 164 public boolean isRemoved() 165 165 { 166 return getData(). isRemoved();166 return getData().getRemovedBy() != null; 167 167 } 168 168 @Override … … 171 171 { 172 172 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 173 getData().setRemoved (removed);173 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 174 174 } 175 175 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/PlateEventType.java
r6881 r7015 189 189 public boolean isRemoved() 190 190 { 191 return getData(). isRemoved();191 return getData().getRemovedBy() != null; 192 192 } 193 193 @Override … … 196 196 { 197 197 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 198 getData().setRemoved (removed);198 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 199 199 } 200 200 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/PlateGeometry.java
r6881 r7015 168 168 public boolean isRemoved() 169 169 { 170 return getData(). isRemoved();170 return getData().getRemovedBy() != null; 171 171 } 172 172 @Override … … 175 175 { 176 176 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 177 getData().setRemoved (removed);177 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 178 178 } 179 179 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Platform.java
r6881 r7015 250 250 public boolean isRemoved() 251 251 { 252 return getData(). isRemoved();252 return getData().getRemovedBy() != null; 253 253 } 254 254 @Override … … 257 257 { 258 258 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 259 getData().setRemoved (removed);259 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 260 260 } 261 261 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/PlatformVariant.java
r6881 r7015 252 252 public boolean isRemoved() 253 253 { 254 return getData(). isRemoved();254 return getData().getRemovedBy() != null; 255 255 } 256 256 @Override … … 259 259 { 260 260 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 261 getData().setRemoved (removed);261 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 262 262 } 263 263 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/PluginDefinition.java
r6898 r7015 459 459 public boolean isRemoved() 460 460 { 461 return getData(). isRemoved();461 return getData().getRemovedBy() != null; 462 462 } 463 463 @Override … … 466 466 { 467 467 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 468 getData().setRemoved (removed);468 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 469 469 } 470 470 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/PluginType.java
r6875 r7015 224 224 public boolean isRemoved() 225 225 { 226 return getData(). isRemoved();226 return getData().getRemovedBy() != null; 227 227 } 228 228 @Override … … 231 231 { 232 232 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 233 getData().setRemoved (removed);233 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 234 234 } 235 235 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Project.java
r6875 r7015 211 211 public boolean isRemoved() 212 212 { 213 return getData(). isRemoved();213 return getData().getRemovedBy() != null; 214 214 } 215 215 @Override … … 218 218 { 219 219 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 220 getData().setRemoved (removed);220 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 221 221 } 222 222 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Quantity.java
r6898 r7015 419 419 public boolean isRemoved() 420 420 { 421 return getData(). isRemoved();421 return getData().getRemovedBy() != null; 422 422 } 423 423 @Override … … 426 426 { 427 427 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 428 getData().setRemoved (removed);428 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 429 429 } 430 430 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Quota.java
r6881 r7015 214 214 public boolean isRemoved() 215 215 { 216 return getData(). isRemoved();216 return getData().getRemovedBy() != null; 217 217 } 218 218 @Override … … 221 221 { 222 222 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 223 getData().setRemoved (removed);223 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 224 224 } 225 225 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/ReporterType.java
r6881 r7015 167 167 public boolean isRemoved() 168 168 { 169 return getData(). isRemoved();169 return getData().getRemovedBy() != null; 170 170 } 171 171 @Override … … 174 174 { 175 175 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 176 getData().setRemoved (removed);176 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 177 177 } 178 178 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Role.java
r6874 r7015 219 219 public boolean isRemoved() 220 220 { 221 return getData(). isRemoved();221 return getData().getRemovedBy() != null; 222 222 } 223 223 @Override … … 226 226 { 227 227 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 228 getData().setRemoved (removed);228 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 229 229 } 230 230 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/SessionControl.java
r7014 r7015 452 452 } 453 453 454 if (userData. isRemoved())454 if (userData.getRemovedBy() != null) 455 455 { 456 456 throw new PermissionDeniedException("The user with login '" + login + "' is flagged for deletion."); -
trunk/src/core/net/sf/basedb/core/Transformation.java
r6874 r7015 216 216 public boolean isRemoved() 217 217 { 218 return getData(). isRemoved();218 return getData().getRemovedBy() != null; 219 219 } 220 220 @Override … … 223 223 { 224 224 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 225 getData().setRemoved (removed);225 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 226 226 } 227 227 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Trashcan.java
r6954 r7015 104 104 org.hibernate.Query query = HibernateUtil.createQuery(session, 105 105 "SELECT trash FROM " + item.getDataClass().getName() + " trash " + 106 "WHERE trash.removed = TRUE");106 "WHERE NOT trash.removedBy IS NULL"); 107 107 removed.addAll(HibernateUtil.loadList(RemovableData.class, query, sc)); 108 108 } … … 115 115 SELECT trash 116 116 FROM RemovableData trash 117 WHERE trash.removed117 WHERE NOT trash.removedBy IS NULL 118 118 */ 119 119 removed = HibernateUtil.loadList(RemovableData.class, query, sc); -
trunk/src/core/net/sf/basedb/core/Unit.java
r6941 r7015 255 255 public boolean isRemoved() 256 256 { 257 return getData(). isRemoved();257 return getData().getRemovedBy() != null; 258 258 } 259 259 @Override … … 262 262 { 263 263 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 264 getData().setRemoved (removed);264 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 265 265 } 266 266 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/Update.java
r6989 r7015 29 29 import java.util.HashSet; 30 30 import java.util.Iterator; 31 import java.util.LinkedHashMap; 31 32 import java.util.LinkedHashSet; 32 33 import java.util.List; … … 59 60 import net.sf.basedb.core.data.QuantityData; 60 61 import net.sf.basedb.core.data.RawBioAssayData; 62 import net.sf.basedb.core.data.RemovableData; 61 63 import net.sf.basedb.core.data.ReporterCloneTemplateData; 62 64 import net.sf.basedb.core.data.RoleKeyData; … … 292 294 </td> 293 295 </tr> 296 <tr> 297 <td>129 and 130</td> 298 <td> 299 Added {@link RemovableData#getRemovedBy()} and removed <code>RemovableData.isRemoved()</code>. 300 Existing items that has been flagged for removal are updated by setting the <code>removedBy</code> 301 property to either the owner of the item or, if the item doesn't have an owner, to the root 302 user (update 129). In a second step (update 130) the <code>removed</code> columns are dropped 303 from all tables. 304 </td> 305 </tr> 294 306 </table> 295 307 … … 475 487 schemaVersion = setSchemaVersionInTransaction(session, 128); 476 488 progress_current += 2 * progress_step; 489 } 490 491 if (schemaVersion < 130) 492 { 493 if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 130..."); 494 schemaVersion = updateToSchemaVersion130(session, schemaVersion); 495 progress_current += 2 * progress_step; 477 496 } 478 497 … … 1532 1551 1533 1552 /** 1553 Set the 'removed_by' column to owner of item if 'removed=true' 1554 @return The new schema version (=130) 1555 */ 1556 private static int updateToSchemaVersion130(org.hibernate.Session session, int currentSchemaVersion) 1557 throws BaseException 1558 { 1559 final int schemaVersion = 130; 1560 try 1561 { 1562 // Load tables names and set a flag if it has an 'owner' column or not 1563 Map<String, Boolean> tables = new LinkedHashMap<String, Boolean>(); 1564 for (Item item : Metadata.getRemovableItems()) 1565 { 1566 String tableName = HibernateUtil.getClassMapping(item.getDataClass().getName()).getRootTable().getName(); 1567 // Multiple items may be mapped to the same table (eg. BioMaterials) -- Only add each table once 1568 if (!tables.containsKey(tableName)) 1569 { 1570 // Check if 'removed' column exists 1571 // It is not present in new tables (eg. Kits) 1572 TableInfo tblInfo = getTableInfo(session, tableName); 1573 if (tblInfo.findColumn("removed") != null) 1574 { 1575 tables.put(tableName, tblInfo.findColumn("owner") != null); 1576 } 1577 } 1578 } 1579 1580 if (currentSchemaVersion < 129) 1581 { 1582 // First step is to copy existing information to the new columns 1583 org.hibernate.Transaction tx = null; 1584 try 1585 { 1586 tx = HibernateUtil.newTransaction(session); 1587 1588 int rootId = SystemItems.getId(User.ROOT); 1589 for (Map.Entry<String, Boolean> entry : tables.entrySet()) 1590 { 1591 String tableName = entry.getKey(); 1592 1593 org.hibernate.Query query; 1594 if (entry.getValue()) 1595 { 1596 String sql = "UPDATE [" + tableName + "] SET [removed_by]=[owner] WHERE [removed]=true"; 1597 query = HibernateUtil.createSqlQuery(session, sql); 1598 } 1599 else 1600 { 1601 String sql = "UPDATE [" + tableName + "] SET [removed_by]=:root WHERE [removed]=true"; 1602 query = HibernateUtil.createSqlQuery(session, sql); 1603 query.setInteger("root", rootId); 1604 } 1605 int updated = query.executeUpdate(); 1606 } 1607 1608 setSchemaVersion(session, 129); 1609 1610 // Commit the changes 1611 HibernateUtil.commit(tx); 1612 } 1613 finally 1614 { 1615 if (tx != null && !tx.wasCommitted()) HibernateUtil.rollback(tx); 1616 } 1617 } 1618 1619 // Second step is to drop the old columns that are no longer used in BASE 3.7 1620 for (String tableName : tables.keySet()) 1621 { 1622 dropColumn(session, tableName, "removed", null); 1623 } 1624 1625 // Update the schema version number 1626 setSchemaVersionInTransaction(session, schemaVersion); 1627 1628 log.info("updateToSchemaVersion130: OK"); 1629 } 1630 catch (SQLException ex) 1631 { 1632 log.error("updateToSchemaVersion130: FAILED", ex); 1633 throw new BaseException(ex); 1634 } 1635 catch (RuntimeException ex) 1636 { 1637 log.error("updateToSchemaVersion130: FAILED", ex); 1638 throw ex; 1639 } 1640 1641 return schemaVersion; 1642 } 1643 1644 1645 /** 1534 1646 Vefify and update the remaining quantity of all biomaterials. 1535 1647 @return The number of biomaterial fixed -
trunk/src/core/net/sf/basedb/core/User.java
r6881 r7015 336 336 public boolean isRemoved() 337 337 { 338 return getData(). isRemoved();338 return getData().getRemovedBy() != null; 339 339 } 340 340 @Override … … 343 343 { 344 344 checkPermission(removed ? Permission.DELETE : Permission.WRITE); 345 getData().setRemoved (removed);345 getData().setRemovedBy(removed ? getSessionControl().getLoggedInUserId() : null); 346 346 } 347 347 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/BioAssaySetData.java
r6127 r7015 80 80 ------------------------------------------- 81 81 */ 82 private boolean removed;83 @Override 84 public boolean isRemoved()85 { 86 return removed ;87 } 88 @Override 89 public void setRemoved (boolean removed)90 { 91 this.removed = removed;82 private Integer removedBy; 83 @Override 84 public Integer getRemovedBy() 85 { 86 return removedBy; 87 } 88 @Override 89 public void setRemovedBy(Integer removedBy) 90 { 91 this.removedBy = removedBy; 92 92 } 93 93 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/BioPlateEventTypeData.java
r6127 r7015 75 75 ------------------------------------------- 76 76 */ 77 private boolean removed;77 private Integer removedBy; 78 78 @Override 79 public boolean isRemoved()79 public Integer getRemovedBy() 80 80 { 81 return removed ;81 return removedBy; 82 82 } 83 83 @Override 84 public void setRemoved (boolean removed)84 public void setRemovedBy(Integer removedBy) 85 85 { 86 this.removed = removed;86 this.removedBy = removedBy; 87 87 } 88 88 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/BioPlateTypeData.java
r6056 r7015 73 73 ------------------------------------------- 74 74 */ 75 private boolean removed;75 private Integer removedBy; 76 76 @Override 77 public boolean isRemoved()77 public Integer getRemovedBy() 78 78 { 79 return removed ;79 return removedBy; 80 80 } 81 81 @Override 82 public void setRemoved (boolean removed)82 public void setRemovedBy(Integer removedBy) 83 83 { 84 this.removed = removed;84 this.removedBy = removedBy; 85 85 } 86 86 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/CommonData.java
r6127 r7015 70 70 ------------------------------------------- 71 71 */ 72 private boolean removed;72 private Integer removedBy; 73 73 @Override 74 public boolean isRemoved()74 public Integer getRemovedBy() 75 75 { 76 return removed ;76 return removedBy; 77 77 } 78 78 @Override 79 public void setRemoved (boolean removed)79 public void setRemovedBy(Integer removedBy) 80 80 { 81 this.removed = removed;81 this.removedBy = removedBy; 82 82 } 83 83 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/DataFileTypeData.java
r6127 r7015 76 76 ------------------------------------------- 77 77 */ 78 private boolean removed;79 @Override 80 public boolean isRemoved()81 { 82 return removed ;83 } 84 @Override 85 public void setRemoved (boolean removed)86 { 87 this.removed = removed;78 private Integer removedBy; 79 @Override 80 public Integer getRemovedBy() 81 { 82 return removedBy; 83 } 84 @Override 85 public void setRemovedBy(Integer removedBy) 86 { 87 this.removedBy = removedBy; 88 88 } 89 89 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/ExtraValueTypeData.java
r6127 r7015 77 77 ------------------------------------------- 78 78 */ 79 private boolean removed;80 @Override 81 public boolean isRemoved()82 { 83 return removed ;84 } 85 @Override 86 public void setRemoved (boolean removed)87 { 88 this.removed = removed;79 private Integer removedBy; 80 @Override 81 public Integer getRemovedBy() 82 { 83 return removedBy; 84 } 85 @Override 86 public void setRemovedBy(Integer removedBy) 87 { 88 this.removedBy = removedBy; 89 89 } 90 90 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/GroupData.java
r6127 r7015 78 78 ------------------------------------------- 79 79 */ 80 private boolean removed;81 @Override 82 public boolean isRemoved()83 { 84 return removed ;85 } 86 @Override 87 public void setRemoved (boolean removed)88 { 89 this.removed = removed;80 private Integer removedBy; 81 @Override 82 public Integer getRemovedBy() 83 { 84 return removedBy; 85 } 86 @Override 87 public void setRemovedBy(Integer removedBy) 88 { 89 this.removedBy = removedBy; 90 90 } 91 91 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/ItemSubtypeData.java
r6468 r7015 83 83 ------------------------------------------- 84 84 */ 85 private boolean removed;86 @Override 87 public boolean isRemoved()88 { 89 return removed ;90 } 91 @Override 92 public void setRemoved (boolean removed)93 { 94 this.removed = removed;85 private Integer removedBy; 86 @Override 87 public Integer getRemovedBy() 88 { 89 return removedBy; 90 } 91 @Override 92 public void setRemovedBy(Integer removedBy) 93 { 94 this.removedBy = removedBy; 95 95 } 96 96 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/MessageData.java
r6127 r7015 76 76 ------------------------------------------- 77 77 */ 78 private boolean removed;78 private Integer removedBy; 79 79 @Override 80 public boolean isRemoved()80 public Integer getRemovedBy() 81 81 { 82 return removed ;82 return removedBy; 83 83 } 84 84 @Override 85 public void setRemoved (boolean removed)85 public void setRemovedBy(Integer removedBy) 86 86 { 87 this.removed = removed;87 this.removedBy = removedBy; 88 88 } 89 89 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/MimeTypeData.java
r6127 r7015 77 77 ------------------------------------------- 78 78 */ 79 private boolean removed;79 private Integer removedBy; 80 80 @Override 81 public boolean isRemoved()81 public Integer getRemovedBy() 82 82 { 83 return removed ;83 return removedBy; 84 84 } 85 85 @Override 86 public void setRemoved (boolean removed)86 public void setRemovedBy(Integer removedBy) 87 87 { 88 this.removed = removed;88 this.removedBy = removedBy; 89 89 } 90 90 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/NewsData.java
r6127 r7015 76 76 ------------------------------------------- 77 77 */ 78 private boolean removed;78 private Integer removedBy; 79 79 @Override 80 public boolean isRemoved()80 public Integer getRemovedBy() 81 81 { 82 return removed ;82 return removedBy; 83 83 } 84 84 @Override 85 public void setRemoved (boolean removed)85 public void setRemovedBy(Integer removedBy) 86 86 { 87 this.removed = removed;87 this.removedBy = removedBy; 88 88 } 89 89 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/PlateEventTypeData.java
r6127 r7015 74 74 ------------------------------------------- 75 75 */ 76 private boolean removed;76 private Integer removedBy; 77 77 @Override 78 public boolean isRemoved()78 public Integer getRemovedBy() 79 79 { 80 return removed ;80 return removedBy; 81 81 } 82 82 @Override 83 public void setRemoved (boolean removed)83 public void setRemovedBy(Integer removedBy) 84 84 { 85 this.removed = removed;85 this.removedBy = removedBy; 86 86 } 87 87 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/PlateGeometryData.java
r6127 r7015 75 75 ------------------------------------------- 76 76 */ 77 private boolean removed;77 private Integer removedBy; 78 78 @Override 79 public boolean isRemoved()79 public Integer getRemovedBy() 80 80 { 81 return removed ;81 return removedBy; 82 82 } 83 83 @Override 84 public void setRemoved (boolean removed)84 public void setRemovedBy(Integer removedBy) 85 85 { 86 this.removed = removed;86 this.removedBy = removedBy; 87 87 } 88 88 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/PlatformData.java
r6127 r7015 76 76 ------------------------------------------- 77 77 */ 78 private boolean removed;78 private Integer removedBy; 79 79 @Override 80 public boolean isRemoved()80 public Integer getRemovedBy() 81 81 { 82 return removed ;82 return removedBy; 83 83 } 84 84 @Override 85 public void setRemoved (boolean removed)85 public void setRemovedBy(Integer removedBy) 86 86 { 87 this.removed = removed;87 this.removedBy = removedBy; 88 88 } 89 89 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/PlatformVariantData.java
r6127 r7015 74 74 ------------------------------------------- 75 75 */ 76 private boolean removed;76 private Integer removedBy; 77 77 @Override 78 public boolean isRemoved()78 public Integer getRemovedBy() 79 79 { 80 return removed ;80 return removedBy; 81 81 } 82 82 @Override 83 public void setRemoved (boolean removed)83 public void setRemovedBy(Integer removedBy) 84 84 { 85 this.removed = removed;85 this.removedBy = removedBy; 86 86 } 87 87 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/PluginDefinitionData.java
r6127 r7015 53 53 ------------------------------------------- 54 54 */ 55 private boolean removed;56 @Override 57 public boolean isRemoved()58 { 59 return removed ;60 } 61 @Override 62 public void setRemoved (boolean removed)63 { 64 this.removed = removed;55 private Integer removedBy; 56 @Override 57 public Integer getRemovedBy() 58 { 59 return removedBy; 60 } 61 @Override 62 public void setRemovedBy(Integer removedBy) 63 { 64 this.removedBy = removedBy; 65 65 } 66 66 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/PluginTypeData.java
r6127 r7015 75 75 ------------------------------------------- 76 76 */ 77 private boolean removed;77 private Integer removedBy; 78 78 @Override 79 public boolean isRemoved()79 public Integer getRemovedBy() 80 80 { 81 return removed ;81 return removedBy; 82 82 } 83 83 @Override 84 public void setRemoved (boolean removed)84 public void setRemovedBy(Integer removedBy) 85 85 { 86 this.removed = removed;86 this.removedBy = removedBy; 87 87 } 88 88 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/ProjectData.java
r6127 r7015 77 77 ------------------------------------------- 78 78 */ 79 private boolean removed;80 @Override 81 public boolean isRemoved()82 { 83 return removed ;84 } 85 @Override 86 public void setRemoved (boolean removed)87 { 88 this.removed = removed;79 private Integer removedBy; 80 @Override 81 public Integer getRemovedBy() 82 { 83 return removedBy; 84 } 85 @Override 86 public void setRemovedBy(Integer removedBy) 87 { 88 this.removedBy = removedBy; 89 89 } 90 90 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/QuantityData.java
r6127 r7015 72 72 ------------------------------------------- 73 73 */ 74 private boolean removed;74 private Integer removedBy; 75 75 @Override 76 public boolean isRemoved()76 public Integer getRemovedBy() 77 77 { 78 return removed ;78 return removedBy; 79 79 } 80 80 @Override 81 public void setRemoved (boolean removed)81 public void setRemovedBy(Integer removedBy) 82 82 { 83 this.removed = removed;83 this.removedBy = removedBy; 84 84 } 85 85 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/QuotaData.java
r6468 r7015 48 48 ------------------------------------------- 49 49 */ 50 private boolean removed;50 private Integer removedBy; 51 51 @Override 52 public boolean isRemoved()52 public Integer getRemovedBy() 53 53 { 54 return removed ;54 return removedBy; 55 55 } 56 56 @Override 57 public void setRemoved (boolean removed)57 public void setRemovedBy(Integer removedBy) 58 58 { 59 this.removed = removed;59 this.removedBy = removedBy; 60 60 } 61 61 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/RemovableData.java
r5818 r7015 36 36 <p> 37 37 This interface defines Hibernate database mapping for the 38 <code>removed</code> property to a database column with the same 39 name. If a subclass wants to map these properties to other columns, 40 it should override the {@link #isRemoved()} method and add a 38 <code>removedBy</code> property to the database column <code>removed_by</code>. 39 The column is an integer column holding the ID of the user that 40 flagged the item or null if the item has not been flagged. 41 <p> 42 If a subclass wants to map these properties to other columns, 43 it should override the {@link #getRemovedBy()} method and add a 41 44 Hibernate tag in the comment. 42 45 <p> … … 44 47 <b>Reference implementation</b><br> 45 48 <pre class="code"> 46 private boolean removed;47 public boolean isRemoved()49 private Integer removedBy; 50 public Integer getRemovedBy() 48 51 { 49 return removed ;52 return removedBy; 50 53 } 51 public void setRemoved (boolean removed)54 public void setRemovedBy(Integer userId) 52 55 { 53 this.removed = removed;56 this.removedBy = userId; 54 57 } 55 58 </pre> … … 64 67 65 68 /** 66 Check if the removed flag is set for this item. 67 @return TRUE if the item is flagged as removed, FALSE otherwise 68 @hibernate.property column="`removed`" type="boolean" not-null="true" 69 Get the ID of the user that removed this item. 70 @return The ID of a user or null if the item is not removed 71 @since 3.7 72 @hibernate.property column="`removed_by`" type="int" not-null="false" 69 73 */ 70 public boolean isRemoved();74 public Integer getRemovedBy(); 71 75 72 76 /** 73 Set the removed flag for this item.74 @param removed TRUE if the item should be flagged as removed,75 FALSE otherwise77 Set the ID of the user that removed this item or null 78 to restore the item. 79 @since 3.7 76 80 */ 77 public void setRemoved (boolean removed);78 81 public void setRemovedBy(Integer userId); 82 79 83 } -
trunk/src/core/net/sf/basedb/core/data/ReporterTypeData.java
r6127 r7015 79 79 ------------------------------------------- 80 80 */ 81 private boolean removed;81 private Integer removedBy; 82 82 @Override 83 public boolean isRemoved()83 public Integer getRemovedBy() 84 84 { 85 return removed ;85 return removedBy; 86 86 } 87 87 @Override 88 public void setRemoved (boolean removed)88 public void setRemovedBy(Integer removedBy) 89 89 { 90 this.removed = removed;90 this.removedBy = removedBy; 91 91 } 92 92 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/RoleData.java
r6127 r7015 77 77 ------------------------------------------- 78 78 */ 79 private boolean removed;79 private Integer removedBy; 80 80 @Override 81 public boolean isRemoved()81 public Integer getRemovedBy() 82 82 { 83 return removed ;83 return removedBy; 84 84 } 85 85 @Override 86 public void setRemoved (boolean removed)86 public void setRemovedBy(Integer removedBy) 87 87 { 88 this.removed = removed;88 this.removedBy = removedBy; 89 89 } 90 90 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/TransformationData.java
r6127 r7015 77 77 ------------------------------------------- 78 78 */ 79 private boolean removed;79 private Integer removedBy; 80 80 @Override 81 public boolean isRemoved()81 public Integer getRemovedBy() 82 82 { 83 return removed ;83 return removedBy; 84 84 } 85 85 @Override 86 public void setRemoved (boolean removed)86 public void setRemovedBy(Integer removedBy) 87 87 { 88 this.removed = removed;88 this.removedBy = removedBy; 89 89 } 90 90 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/UnitData.java
r6127 r7015 85 85 ------------------------------------------- 86 86 */ 87 private boolean removed;88 @Override 89 public boolean isRemoved()90 { 91 return removed ;92 } 93 @Override 94 public void setRemoved (boolean removed)95 { 96 this.removed = removed;87 private Integer removedBy; 88 @Override 89 public Integer getRemovedBy() 90 { 91 return removedBy; 92 } 93 @Override 94 public void setRemovedBy(Integer removedBy) 95 { 96 this.removedBy = removedBy; 97 97 } 98 98 // ------------------------------------------- -
trunk/src/core/net/sf/basedb/core/data/UserData.java
r6356 r7015 96 96 ------------------------------------------- 97 97 */ 98 private boolean removed = false;99 @Override 100 public boolean isRemoved()101 { 102 return removed ;103 } 104 @Override 105 public void setRemoved (boolean removed)106 { 107 this.removed = removed;98 private Integer removedBy; 99 @Override 100 public Integer getRemovedBy() 101 { 102 return removedBy; 103 } 104 @Override 105 public void setRemovedBy(Integer removedBy) 106 { 107 this.removedBy = removedBy; 108 108 } 109 109 // -------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.