Changeset 3810 for branches/2.4-stable
- Timestamp:
- Oct 9, 2007, 12:06:20 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4-stable/src/core/net/sf/basedb/core/VirtualColumn.java
r3679 r3810 68 68 */ 69 69 public static final VirtualColumn CUBE = 70 new VirtualColumn("cube", "cube", Hibernate.SHORT, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 70 new VirtualColumn("cube", "cube", Hibernate.SHORT, 0, 71 !INDEXED, !NULLABLE, PRIMARY_KEY); 71 72 72 73 /** … … 75 76 */ 76 77 public static final VirtualColumn LAYER = 77 new VirtualColumn("layer", "layer", Hibernate.SHORT, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 78 new VirtualColumn("layer", "layer", Hibernate.SHORT, 0, 79 !INDEXED, !NULLABLE, PRIMARY_KEY); 78 80 79 81 /** … … 82 84 */ 83 85 public static final VirtualColumn COLUMN = 84 new VirtualColumn("column", "column", Hibernate.SHORT, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 86 new VirtualColumn("column", "column", Hibernate.SHORT, 0, 87 !INDEXED, !NULLABLE, PRIMARY_KEY); 85 88 86 89 /** … … 88 91 */ 89 92 public static final VirtualColumn POSITION = 90 new VirtualColumn("position", "position", Hibernate.INTEGER, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 93 new VirtualColumn("position", "position", Hibernate.INTEGER, 0, 94 !INDEXED, !NULLABLE, PRIMARY_KEY); 91 95 92 96 /** … … 95 99 */ 96 100 public static final VirtualColumn FILTER = 97 new VirtualColumn("filter", "filter", Hibernate.SHORT, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 101 new VirtualColumn("filter", "filter", Hibernate.SHORT, 0, 102 !INDEXED, !NULLABLE, PRIMARY_KEY); 98 103 99 104 /** … … 102 107 */ 103 108 public static final VirtualColumn EXTRA = 104 new VirtualColumn("extra", "extra", Hibernate.SHORT, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 109 new VirtualColumn("extra", "extra", Hibernate.SHORT, 0, 110 !INDEXED, !NULLABLE, PRIMARY_KEY); 105 111 106 112 /** … … 110 116 */ 111 117 public static final VirtualColumn REPORTER_ID = 112 new VirtualColumn("reporterId", "reporter_id", Hibernate.INTEGER, 0, INDEXED, NULLABLE, !PRIMARY_KEY); 118 new VirtualColumn("reporterId", "reporter_id", Hibernate.INTEGER, 0, 119 !INDEXED, NULLABLE, !PRIMARY_KEY); 113 120 114 121 /** … … 118 125 */ 119 126 public static final VirtualColumn RAWDATA_ID = 120 new VirtualColumn("rawDataId", "rawdata_id", Hibernate.INTEGER, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 127 new VirtualColumn("rawDataId", "rawdata_id", Hibernate.INTEGER, 0, 128 !INDEXED, !NULLABLE, PRIMARY_KEY); 121 129 122 130 /** … … 126 134 */ 127 135 public static final VirtualColumn RAWBIOASSAY_ID = 128 new VirtualColumn("rawBioAssayId", "rawbioassay_id", Hibernate.INTEGER, 0, INDEXED, !NULLABLE, PRIMARY_KEY); 136 new VirtualColumn("rawBioAssayId", "rawbioassay_id", Hibernate.INTEGER, 0, 137 !INDEXED, !NULLABLE, PRIMARY_KEY); 129 138 130 139 /** … … 132 141 */ 133 142 public static final VirtualColumn EXTRA_INT = 134 new VirtualColumn("extraInt", "value", Hibernate.INTEGER, 0, !INDEXED, NULLABLE, !PRIMARY_KEY); 143 new VirtualColumn("extraInt", "value", Hibernate.INTEGER, 0, 144 !INDEXED, NULLABLE, !PRIMARY_KEY); 135 145 136 146 /** … … 138 148 */ 139 149 public static final VirtualColumn EXTRA_FLOAT = 140 new VirtualColumn("extraFloat", "value", Hibernate.FLOAT, 0, !INDEXED, NULLABLE, !PRIMARY_KEY); 150 new VirtualColumn("extraFloat", "value", Hibernate.FLOAT, 0, 151 !INDEXED, NULLABLE, !PRIMARY_KEY); 141 152 142 153 /** … … 144 155 */ 145 156 public static final VirtualColumn EXTRA_STRING = 146 new VirtualColumn("extraString", "value", Hibernate.STRING, 255, !INDEXED, NULLABLE, !PRIMARY_KEY); 157 new VirtualColumn("extraString", "value", Hibernate.STRING, 255, 158 !INDEXED, NULLABLE, !PRIMARY_KEY); 147 159 148 160 /** 149 161 A cache of virtual column objects for channels. 150 162 */ 151 private static final Map<Integer, VirtualColumn> channels = new HashMap<Integer, VirtualColumn>(); 163 private static final Map<Integer, VirtualColumn> channels = 164 new HashMap<Integer, VirtualColumn>(); 152 165 153 166 /** 154 167 A cache of virtual column objects for extra value types. 155 168 */ 156 private static final Map<Type, VirtualColumn> extraValueColumns = new HashMap<Type, VirtualColumn>(); 169 private static final Map<Type, VirtualColumn> extraValueColumns = 170 new HashMap<Type, VirtualColumn>(); 157 171 158 172 // Initialise the cache … … 173 187 if (ch == null) 174 188 { 175 ch = new VirtualColumn("ch"+channel, "ch"+channel, Hibernate.FLOAT, 0, !INDEXED, NULLABLE, !PRIMARY_KEY); 189 ch = new VirtualColumn("ch"+channel, "ch"+channel, Hibernate.FLOAT, 0, 190 !INDEXED, NULLABLE, !PRIMARY_KEY); 176 191 synchronized (channels) 177 192 {
Note: See TracChangeset
for help on using the changeset viewer.