Changeset 7786
- Timestamp:
- Mar 2, 2020, 9:10:33 AM (3 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/3.15-stable merged: 7746,7751-7755,7763,7783 /tags/3.15.3 (added) merged: 7784
- Property svn:mergeinfo changed
-
trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ListColumnAction.java
r6875 r7786 22 22 package net.sf.basedb.clients.web.extensions.list; 23 23 24 import net.sf.basedb.clients.web.extensions.UnsafeScriptable;25 24 import net.sf.basedb.core.DbControl; 26 25 import net.sf.basedb.core.Type; … … 42 41 @base.modified $Date$ 43 42 */ 44 @UnsafeScriptable45 43 public interface ListColumnAction<I, V> 46 44 extends Action -
trunk/src/clients/web/net/sf/basedb/clients/web/extensions/menu/MenuItemAction.java
r6652 r7786 22 22 package net.sf.basedb.clients.web.extensions.menu; 23 23 24 import net.sf.basedb.clients.web.extensions.UnsafeScriptable;25 24 import net.sf.basedb.util.extensions.Action; 26 25 … … 45 44 @base.modified $Date$ 46 45 */ 47 @UnsafeScriptable48 46 public interface MenuItemAction 49 47 extends Action -
trunk/src/clients/web/net/sf/basedb/clients/web/extensions/section/SectionAction.java
r6407 r7786 22 22 package net.sf.basedb.clients.web.extensions.section; 23 23 24 import net.sf.basedb.clients.web.extensions.UnsafeScriptable;25 24 import net.sf.basedb.util.extensions.Action; 26 25 … … 32 31 @base.modified $Date$ 33 32 */ 34 @UnsafeScriptable35 33 public interface SectionAction 36 34 extends Action -
trunk/src/clients/web/net/sf/basedb/clients/web/extensions/tabcontrol/TabAction.java
r6653 r7786 22 22 package net.sf.basedb.clients.web.extensions.tabcontrol; 23 23 24 import net.sf.basedb.clients.web.extensions.UnsafeScriptable;25 24 import net.sf.basedb.core.Help; 26 25 import net.sf.basedb.util.extensions.Action; … … 33 32 @base.modified $Date$ 34 33 */ 35 @UnsafeScriptable36 34 public interface TabAction 37 35 extends Action -
trunk/src/clients/web/net/sf/basedb/clients/web/extensions/toolbar/ButtonAction.java
r6654 r7786 22 22 package net.sf.basedb.clients.web.extensions.toolbar; 23 23 24 import net.sf.basedb.clients.web.extensions.UnsafeScriptable;25 24 import net.sf.basedb.util.extensions.Action; 26 25 … … 32 31 @base.modified $Date:2008-03-20 12:15:25 +0100 (Thu, 20 Mar 2008) $ 33 32 */ 34 @UnsafeScriptable35 33 public interface ButtonAction 36 34 extends Action -
trunk/src/core/net/sf/basedb/core/ParameterType.java
r6987 r7786 326 326 public boolean isEnumeration() 327 327 { 328 return (enumeration != null && enumeration.size() > 0) || (items != null && items.size() > 0);328 return (enumeration != null) || (items != null); 329 329 } 330 330 -
trunk/src/core/net/sf/basedb/util/timer/ThreadTimerTask.java
r6684 r7786 43 43 { 44 44 45 private static final org.slf4j.Logger log = 46 org.slf4j.LoggerFactory.getLogger(ThreadTimerTask.class); 47 45 48 private final TimerTask task; 46 49 private final boolean allowMultiple; … … 69 72 public final synchronized void run() 70 73 { 71 Thread t = null; 72 if (allowMultiple) 74 try 73 75 { 74 // We just create another thread75 t = new Thread(task);76 }77 else if (!isExecuting)78 {79 // Create a new thread that also manages the isExecuting flag80 isExecuting = true;81 t = new Thread(82 new Runnable()83 {84 @Override85 public void run()76 Thread t = null; 77 if (allowMultiple) 78 { 79 // We just create another thread 80 t = new Thread(task); 81 } 82 else if (!isExecuting) 83 { 84 // Create a new thread that also manages the isExecuting flag 85 isExecuting = true; 86 t = new Thread( 87 new Runnable() 86 88 { 87 try 89 @Override 90 public void run() 88 91 { 89 task.run(); 90 } 91 finally 92 { 93 isExecuting = false; 92 try 93 { 94 task.run(); 95 } 96 finally 97 { 98 isExecuting = false; 99 } 94 100 } 95 101 } 96 } 97 ); 102 ); 103 } 104 else 105 { 106 // Do not allow multiple thread to execute the task 107 } 108 // Start the thread 109 if (t != null) t.start(); 98 110 } 99 else111 catch (Throwable t) 100 112 { 101 // Do not allow multiple thread to execute the task113 log.error("Failed to start task: " + task, t); 102 114 } 103 // Start the thread104 if (t != null) t.start();105 115 } 106 116 @Override -
trunk/www/common/plugin/configure.jsp
r7679 r7786 80 80 <%! 81 81 List<?> getParameterValues(PluginParameter<?> pp, DbControl dc, javax.servlet.http.HttpServletRequest request, 82 PluginConfigurationRequest pcRequest, ItemContext currentContext )82 PluginConfigurationRequest pcRequest, ItemContext currentContext, Job job) 83 83 { 84 84 ParameterType<?> pType = pp.getParameterType(); … … 106 106 Object charset = currentContext.getObject("last-file-charset"); 107 107 if (charset != null) values = Collections.singletonList(charset); 108 } 109 110 // Special handling for "dryRun" parameter which is typically not stored as a job proerty 111 if ((values == null || values.size() == 0) && Parameters.DRY_RUN_PARAMETER.equals(pp.getName())) 112 { 113 if (job != null && job.isDryRun()) 114 { 115 values = Collections.singletonList(true); 116 } 108 117 } 109 118 … … 272 281 json.put("enumeration", pType.isEnumeration() ? 1 : 0); 273 282 json.put("multiplicity", pType.getMultiplicity()); 274 List<?> values = getParameterValues(pp, dc, request, pcRequest, currentContext );283 List<?> values = getParameterValues(pp, dc, request, pcRequest, currentContext, job); 275 284 json.put("values", convertToJson(values, dc, pType, dateFormatter, dateTimeFormatter)); 276 285 } -
trunk/www/my_base/messages/index.jsp
r7604 r7786 60 60 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %> 61 61 <%! 62 private static final ItemContext defaultContext = Base.createDefaultContext("timeSent", " all");62 private static final ItemContext defaultContext = Base.createDefaultContext("timeSent", "name,from,timeSent,read,description"); 63 63 private static final Item itemType = Item.MESSAGE; 64 64 %> -
trunk/www/my_base/messages/list_messages.jsp
r7604 r7786 168 168 exportable="true" 169 169 formatter="<%=dateTimeFormatter%>" 170 /> 171 <tbl:columndef 172 id="read" 173 property="read" 174 datatype="boolean" 175 title="Has been read" 176 sortable="true" 177 filterable="true" 178 exportable="true" 170 179 /> 171 180 <tbl:columndef … … 391 400 <tbl:cell column="from"><%=HTML.encodeTags(item.getFrom())%></tbl:cell> 392 401 <tbl:cell column="timeSent" value="<%=item.getTimeSent()%>" /> 402 <tbl:cell column="read" value="<%=item.isRead()%>" /> 393 403 <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell> 394 404 <tbl:cell column="job"><base:propertyvalue item="<%=item%>" property="job" enableEditLink="<%=editLink%>" enablePropertyLink="<%=mode.hasPropertyLink()%>"/></tbl:cell> -
trunk/www/views/derivedbioassays/view_bioassay.jsp
r7604 r7786 713 713 <tbl:row> 714 714 <tbl:cell column="name"><%=Base.getLinkedName(ID, item, false, true)%></tbl:cell> 715 <tbl:cell column="platform"><base:propertyvalue item="<%=item%>" property="platform" /></tbl:cell> 715 <tbl:cell column="platform"> 716 <base:propertyvalue item="<%=item%>" property="platform" /> / 717 <%=item.getRawDataType().toString() %> 718 </tbl:cell> 716 719 <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell> 717 720 </tbl:row>
Note: See TracChangeset
for help on using the changeset viewer.